[Gnash-commit] gnash libbase/image.cpp libbase/image.h ./Chang...

[Michael Carlson]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Michael Carlson <address@hidden>        06/02/15 13:53:27

Modified files:
        libbase        : image.cpp image.h 
        .              : ChangeLog 
        server         : impl.cpp 

Log message:
        Revert previous jpeg change. Upon testing with more files in my library,
        the change breaks some files. I don't know why this jpeg tag is 
different
        but I'll put some notes about what I know so far in savannah.
        
        I'll make sure to do more thorough tests before, not after, committing 
to CVS
        in the future :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/image.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/image.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.145&tr2=1.146&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.145 gnash/ChangeLog:1.146
--- gnash/ChangeLog:1.145       Wed Feb 15 11:25:26 2006
+++ gnash/ChangeLog     Wed Feb 15 13:53:27 2006
@@ -17,17 +17,6 @@
        * server/swf.h: added note about which action_buffer private
        method implmements which ACTION_DELETE* block.
 
-
-2006-02-15 Michael Carlson <address@hidden>
-
-       * server/impl.cpp: use read_swf_jpeg2_version6() when flash file
-       version <= 6
-       * libbase/jpeg.cpp: undo previous patch - only worked for some
-       flash file versions
-       * libbase/image.h: Add read_swf_jpeg2_version6()
-       * libbase/image.cpp: Fix jpeg2 loading code to work on flash
-       file versions <=6 and >=7 (implement read_swf_jpeg2_version6)
-
 2006-02-14  Rob Savoye  <address@hidden>
 
        * configure.ac: Look for shm_open().
Index: gnash/libbase/image.cpp
diff -u gnash/libbase/image.cpp:1.3 gnash/libbase/image.cpp:1.4
--- gnash/libbase/image.cpp:1.3 Wed Feb 15 03:07:22 2006
+++ gnash/libbase/image.cpp     Wed Feb 15 13:53:27 2006
@@ -279,7 +279,8 @@
                delete j_in;
 
                return im;
-       }
+       }
+
 
        rgb*    read_swf_jpeg2(tu_file* in)
        // Create and read a new image from the stream.  Image is in
@@ -287,18 +288,10 @@
        // separate "stream" -- otherwise it's just normal JPEG).  The
        // IJG documentation describes this as "abbreviated" format.
        {
-               jpeg::input*    j_in = jpeg::input::create(in);
+               jpeg::input*    j_in = 
jpeg::input::create_swf_jpeg2_header_only(in);
                if (j_in == NULL) return NULL;
                
-               // start_image already called by create() above
-
-               rgb*    im = image::create_rgb(j_in->get_width(), 
j_in->get_height());
-
-               for (int y = 0; y < j_in->get_height(); y++) {
-                       j_in->read_scanline(scanline(im, y));
-               }
-
-               j_in->finish_image();
+               rgb* im = read_swf_jpeg2_with_tables(j_in);
 
                delete j_in;
 
@@ -325,20 +318,6 @@
                return im;
        }
 
-       rgb* read_swf_jpeg2_version6(tu_file* in)
-       // The same as read_swf_jpeg2, but this version works in flash files 
with
-       // version 6 or lower
-       {
-               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;
-       }
-
 
        rgba*   read_swf_jpeg3(tu_file* in)
        // For reading SWF JPEG3-style image data, like ordinary JPEG, 
Index: gnash/libbase/image.h
diff -u gnash/libbase/image.h:1.3 gnash/libbase/image.h:1.4
--- gnash/libbase/image.h:1.3   Wed Feb 15 03:07:22 2006
+++ gnash/libbase/image.h       Wed Feb 15 13:53:27 2006
@@ -108,11 +108,6 @@
        /// headers stored in the given jpeg::input object.
        rgb*    read_swf_jpeg2_with_tables(jpeg::input* loader);
 
-       // \brief
-       // For reading SWF JPEG2-style image data, version 6 flash files
-       // or lower
-       rgb* read_swf_jpeg2_version6(tu_file* in);
-
        /// \brief
        /// For reading SWF JPEG3-style image data, like ordinary JPEG, 
        /// but stores the data in rgba format.
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.17 gnash/server/impl.cpp:1.18
--- gnash/server/impl.cpp:1.17  Wed Feb 15 03:07:22 2006
+++ gnash/server/impl.cpp       Wed Feb 15 13:53:27 2006
@@ -932,11 +932,7 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
        {
 #if TU_CONFIG_LINK_TO_JPEGLIB
-               image::rgb* im;
-               if (m->get_version() <= 6)
-                       im = 
image::read_swf_jpeg2_version6(in->get_underlying_stream());
-               else
-                   im = image::read_swf_jpeg2(in->get_underlying_stream());
+               image::rgb* im = 
image::read_swf_jpeg2(in->get_underlying_stream());
            bi = render::create_bitmap_info_rgb(im);
            delete im;
 #else