[Gnash-commit] gnash ./ChangeLog ./changelog.sh libbase/image....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/04/24 14:42:52

Modified files:
        .              : ChangeLog changelog.sh 
        libbase        : image.cpp jpeg.cpp 
        server         : impl.cpp 

Log message:
        2006-04-24  Timothy Lee  <address@hidden>
        * libbase/image.cpp: Remove read_swf_jpeg2(), it's unnecessary now
        that read_jpeg() reads multiple headers.
        * libbase/jpeg.cpp: Read a jpeg with with multiple headers
        correctly.
        * server/impl.cpp: Call read_jpeg() instead of read_swf_jpeg2().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.227&tr2=1.228&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/changelog.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/image.cpp.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/jpeg.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.24&tr2=1.25&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.227 gnash/ChangeLog:1.228
--- gnash/ChangeLog:1.227       Sun Apr 23 14:40:09 2006
+++ gnash/ChangeLog     Mon Apr 24 14:42:51 2006
@@ -1,3 +1,11 @@
+2006-04-24  Timothy Lee  <address@hidden>
+       
+       * libbase/image.cpp: Remove read_swf_jpeg2(), it's unnecessary now
+       that read_jpeg() reads multiple headers.
+       * libbase/jpeg.cpp: Read a jpeg with with multiple headers
+       correctly.
+       * server/impl.cpp: Call read_jpeg() instead of read_swf_jpeg2().
+
 2006-04-23 <address@hidden>
 
        * server/Movie.cpp, server/Movie.h, server/Object.h,
Index: gnash/changelog.sh
diff -u gnash/changelog.sh:1.1 gnash/changelog.sh:1.2
--- gnash/changelog.sh:1.1      Sat Apr 22 22:15:53 2006
+++ gnash/changelog.sh  Mon Apr 24 14:42:52 2006
@@ -6,11 +6,13 @@
 # or changed. You can then easily fill in the raw data with proper
 # ChangeLog entries.
 
+# Please do not file bug reports on this script, it is unsupported. I
+# just checked in it incase other developers find it useful.
+
 infile=Cvs.diff
 outfile=entry.txt
 declare -a files
 
-#2006-03-10  Rob Savoye  <address@hidden>
 # Format the header line
 name=`grep $USER /etc/passwd | cut -d : -f 5 | sed -e 's:,::g'`
 now=`date -u "+%Y-%m-%d"`
Index: gnash/libbase/image.cpp
diff -u gnash/libbase/image.cpp:1.5 gnash/libbase/image.cpp:1.6
--- gnash/libbase/image.cpp:1.5 Sun Feb 26 15:49:29 2006
+++ gnash/libbase/image.cpp     Mon Apr 24 14:42:52 2006
@@ -282,26 +282,10 @@
        }
 
 
-       rgb*    read_swf_jpeg2(tu_file* in)
-       // Create and read a new image from the stream.  Image is in
-       // SWF JPEG2-style format (the encoding tables come first in a
-       // separate "stream" -- otherwise it's just normal JPEG).  The
-       // IJG documentation describes this as "abbreviated" format.
-       {
-               jpeg::input*    j_in = 
jpeg::input::create_swf_jpeg2_header_only(in);
-               if (j_in == NULL) return NULL;
-               
-               rgb* im = read_swf_jpeg2_with_tables(j_in);
-
-               delete j_in;
-
-               return im;              
-       }
-
-
        rgb*    read_swf_jpeg2_with_tables(jpeg::input* j_in)
        // Create and read a new image, using a input object that
-       // already has tables loaded.
+       // already has tables loaded.  The IJG documentation describes
+       // this as "abbreviated" format.
        {
                assert(j_in);
 
Index: gnash/libbase/jpeg.cpp
diff -u gnash/libbase/jpeg.cpp:1.4 gnash/libbase/jpeg.cpp:1.5
--- gnash/libbase/jpeg.cpp:1.4  Sun Feb 26 15:49:30 2006
+++ gnash/libbase/jpeg.cpp      Mon Apr 24 14:42:52 2006
@@ -372,7 +372,13 @@
                        assert(m_compressor_opened == false);
 
                        // Now, read the image header.
-                       jpeg_read_header(&m_cinfo, TRUE);
+                       int result;
+                       do
+                       {
+                               // Read all available headers
+                               result = jpeg_read_header(&m_cinfo, FALSE);
+                       } while (result == JPEG_HEADER_TABLES_ONLY);
+                       assert(result == JPEG_HEADER_OK);
 
                        jpeg_start_decompress(&m_cinfo);
                        m_compressor_opened = true;
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.24 gnash/server/impl.cpp:1.25
--- gnash/server/impl.cpp:1.24  Sun Mar 12 00:35:15 2006
+++ gnash/server/impl.cpp       Mon Apr 24 14:42:52 2006
@@ -928,7 +928,7 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
        {
 #if TU_CONFIG_LINK_TO_JPEGLIB
-               image::rgb* im = 
image::read_swf_jpeg2(in->get_underlying_stream());
+           image::rgb* im = image::read_jpeg(in->get_underlying_stream());
            bi = render::create_bitmap_info_rgb(im);
            delete im;
 #else