[Gnash-commit] gnash/libbase jpeg.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/08/29 16:21:24

Modified files:
        libbase        : jpeg.cpp 

Log message:
        fixed bug #17507

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- jpeg.cpp    25 Aug 2006 23:53:32 -0000      1.10
+++ jpeg.cpp    29 Aug 2006 16:21:24 -0000      1.11
@@ -376,13 +376,20 @@
                        assert(m_compressor_opened == false);
 
                        // Now, read the image header.
-                       int result;
-                       do
-                       {
+//                     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);
+//                             result = jpeg_read_header(&m_cinfo, FALSE);
+//                     } while (result == JPEG_HEADER_TABLES_ONLY);
+//                     assert(result == JPEG_HEADER_OK);
+                       
+                       // hack, FIXME
+                       // #define DSTATE_READY 202     /* found SOS, ready for 
start_decompress */
+                       while (m_cinfo.global_state != 202)     //vv
+                       {
+                               jpeg_read_header(&m_cinfo, FALSE);
+                       }
 
                        jpeg_start_decompress(&m_cinfo);
                        m_compressor_opened = true;