[patch] Fix invalid conversion of booleans in jpeg codec of bundled chromium

qtwebengine-5.7.1-libjpeg9-booleans-fix.patch (text/plain), 1.86 KB, created by Maurice van der Pot on 2017-01-27 20:47:36 UTC

diff -ruN qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc qtwebengine-opensource-src-5.7.1-fixed/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
--- qtwebengine-opensource-src-5.7.1/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc	2016-11-07 15:46:18.000000000 +0100
+++ qtwebengine-opensource-src-5.7.1-fixed/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc	2017-01-27 21:43:22.656163863 +0100
@@ -120,7 +120,7 @@
   // tell libjpeg where to write the next data
   cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
   cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
-  return 1;
+  return TRUE;
 }
 
 // Cleans up the JpegEncoderState to prepare for returning in the final form.
@@ -261,7 +261,7 @@
   cinfo.data_precision = 8;
 
   jpeg_set_defaults(&cinfo);
-  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
+  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
 
   // set up the destination manager
   jpeg_destination_mgr destmgr;
@@ -273,7 +273,7 @@
   JpegEncoderState state(output);
   cinfo.client_data = &state;
 
-  jpeg_start_compress(&cinfo, 1);
+  jpeg_start_compress(&cinfo, TRUE);
 
   // feed it the rows, doing necessary conversions for the color format
 #ifdef JCS_EXTENSIONS
@@ -359,7 +359,7 @@
 //   set to a positive value if TRUE is returned. A FALSE return should only
 //   be used when I/O suspension is desired."
 boolean FillInputBuffer(j_decompress_ptr cinfo) {
-  return false;
+  return FALSE;
 }
 
 // Skip data in the buffer. Since we have all the data at once, this operation
@@ -487,7 +487,7 @@
   cinfo.client_data = &state;
 
   // fill the file metadata into our buffer
-  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
+  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
     return false;
 
   // we want to always get RGB data out