[patch] Fixes mixed use of booleans in JPEGImageDecoder (webkit-gtk-1.8.3)

webkit-gtk-1.8.3-mixed-booleans.patch (text/plain), 1.59 KB, created by Maurice van der Pot on 2013-10-06 15:22:02 UTC

diff -ruN webkit-1.8.3/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp webkit-1.8.3-fixed/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
--- webkit-1.8.3/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	2012-08-20 18:26:10.000000000 +0200
+++ webkit-1.8.3-fixed/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	2013-10-06 16:14:42.000000000 +0200
@@ -234,7 +234,7 @@
         switch (m_state) {
         case JPEG_HEADER:
             // Read file parameters with jpeg_read_header().
-            if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
+            if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED)
                 return false; // I/O suspension.
 
             switch (m_info.jpeg_color_space) {
@@ -295,9 +295,9 @@
             // of progressive JPEG.
             m_info.dct_method = dctMethod();
             m_info.dither_mode = JDITHER_FS;
-            m_info.do_fancy_upsampling = true;
-            m_info.enable_2pass_quant = false;
-            m_info.do_block_smoothing = true;
+            m_info.do_fancy_upsampling = TRUE;
+            m_info.enable_2pass_quant = FALSE;
+            m_info.do_block_smoothing = TRUE;
 
             // Start decompressor.
             if (!jpeg_start_decompress(&m_info))
@@ -420,7 +420,7 @@
     // Our decode step always sets things up properly, so if this method is ever
     // called, then we have hit the end of the buffer.  A return value of false
     // indicates that we have no data to supply yet.
-    return false;
+    return FALSE;
 }
 
 void term_source(j_decompress_ptr jd)