commit 3dfb55b889fdd8add2579757b16f839d87740043
author Miklos Vajna <vmiklos@collabora.co.uk> Wed Jan 23 19:27:10 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Jan 23 19:27:10 2019 +0000
tree 616fa7b3eba31b43a49445016eebad7b047be12a
parent 56250c3ee3c02842227d0eafc41d1551942f9924

core: use the libjpeg boolean type in the jpeg codec

The boolean type in this scope is defined at
third_party/libjpeg_turbo/jmorecfg.h, but in case -DUSE_SYSTEM_LIBJPEG
is used, it's possible this type is provided by jpeg-9c, which defines
boolean as an enum, and then it using the libjpeg-provided TRUE and
FALSE makes more sense.

Bug: pdfium:1228
Change-Id: I3f8d3664e539ddbd4bdaaff142f9a1f4e89f0a50
Reviewed-on: https://pdfium-review.googlesource.com/c/48730
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcodec/codec/ccodec_jpegmodule.cpp

diff --git a/core/fxcodec/codec/ccodec_jpegmodule.cpp b/core/fxcodec/codec/ccodec_jpegmodule.cpp
index 2ba04bb..82a761c 100644
--- a/core/fxcodec/codec/ccodec_jpegmodule.cpp
+++ b/core/fxcodec/codec/ccodec_jpegmodule.cpp
@@ -77,11 +77,11 @@
 }
 
 static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
-  return 0;
+  return FALSE;
 }
 
 static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
-  return 0;
+  return FALSE;
 }
 
 static void _error_do_nothing(j_common_ptr cinfo) {}
@@ -146,7 +146,7 @@
     jpeg_destroy_decompress(&cinfo);
     return false;
   }
-  int ret = jpeg_read_header(&cinfo, true);
+  int ret = jpeg_read_header(&cinfo, TRUE);
   if (ret != JPEG_HEADER_OK) {
     jpeg_destroy_decompress(&cinfo);
     return false;
@@ -222,7 +222,7 @@
   }
   cinfo.image_width = m_OrigWidth;
   cinfo.image_height = m_OrigHeight;
-  int ret = jpeg_read_header(&cinfo, true);
+  int ret = jpeg_read_header(&cinfo, TRUE);
   if (ret != JPEG_HEADER_OK)
     return false;
 
@@ -439,7 +439,7 @@
                                   int* nComps,
                                   CFX_DIBAttribute* pAttribute) {
   auto* ctx = static_cast<CJpegContext*>(pContext);
-  int ret = jpeg_read_header(&ctx->m_Info, true);
+  int ret = jpeg_read_header(&ctx->m_Info, TRUE);
   if (ret == JPEG_SUSPENDED)
     return 2;
   if (ret != JPEG_HEADER_OK)