Fix some FX_BOOL / int noise in core/fx*

core/fxge/agg/fx_agg_driver.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/agg/fx_agg_driver.h"
 
 #include <algorithm>
 
@@ skipping 222 matching lines @@
                      FXSYS_GetYValue(cmyk), FXSYS_GetKValue(cmyk), r, g, b);
   return ArgbEncode(alpha, r, g, b);
 }
 
 FX_BOOL DibSetPixel(CFX_DIBitmap* pDevice,
                     int x,
                     int y,
                     uint32_t color,
                     int alpha_flag,
                     void* pIccTransform) {
-  FX_BOOL bObjCMYK = FXGETFLAG_COLORTYPE(alpha_flag);
+  FX_BOOL bObjCMYK = !!FXGETFLAG_COLORTYPE(alpha_flag);
   int alpha = bObjCMYK ? FXGETFLAG_ALPHA_FILL(alpha_flag) : FXARGB_A(color);
   if (pIccTransform) {
     CCodec_IccModule* pIccModule =
         CFX_GEModule::Get()->GetCodecModule()->GetIccModule();
     color = bObjCMYK ? FXCMYK_TODIB(color) : FXARGB_TODIB(color);
     pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&color,
                                   (uint8_t*)&color, 1);
     color = bObjCMYK ? FXCMYK_TODIB(color) : FXARGB_TODIB(color);
     if (!pDevice->IsCmykImage()) {
       color = (color & 0xffffff) | (alpha << 24);
@@ skipping 1054 matching lines @@
     } else {
       m_ClipBox.left = m_ClipBox.top = 0;
       m_ClipBox.right = m_pDevice->GetWidth();
       m_ClipBox.bottom = m_pDevice->GetHeight();
     }
     m_pClipMask = nullptr;
     if (m_pClipRgn && m_pClipRgn->GetType() == CFX_ClipRgn::MaskF) {
       m_pClipMask = m_pClipRgn->GetMask().GetObject();
     }
     m_bFullCover = bFullCover;
-    FX_BOOL bObjectCMYK = FXGETFLAG_COLORTYPE(alpha_flag);
+    FX_BOOL bObjectCMYK = !!FXGETFLAG_COLORTYPE(alpha_flag);
     FX_BOOL bDeviceCMYK = pDevice->IsCmykImage();
     m_Alpha = bObjectCMYK ? FXGETFLAG_ALPHA_FILL(alpha_flag) : FXARGB_A(color);
     CCodec_IccModule* pIccModule = nullptr;
     if (!CFX_GEModule::Get()->GetCodecModule() ||
         !CFX_GEModule::Get()->GetCodecModule()->GetIccModule()) {
       pIccTransform = nullptr;
     } else {
       pIccModule = CFX_GEModule::Get()->GetCodecModule()->GetIccModule();
     }
     if (m_pDevice->GetBPP() == 8) {
@@ skipping 132 matching lines @@
   if ((fill_mode & 3) && fill_color) {
     CAgg_PathData path_data;
     path_data.BuildPath(pPathData, pObject2Device);
     agg::rasterizer_scanline_aa rasterizer;
     rasterizer.clip_box(0.0f, 0.0f, (FX_FLOAT)(GetDeviceCaps(FXDC_PIXEL_WIDTH)),
                         (FX_FLOAT)(GetDeviceCaps(FXDC_PIXEL_HEIGHT)));
     rasterizer.add_path(path_data.m_PathData);
     rasterizer.filling_rule((fill_mode & 3) == FXFILL_WINDING
                                 ? agg::fill_non_zero
                                 : agg::fill_even_odd);
-    if (!RenderRasterizer(rasterizer, fill_color, fill_mode & FXFILL_FULLCOVER,
-                          FALSE, 0, nullptr)) {
+    if (!RenderRasterizer(rasterizer, fill_color,
+                          !!(fill_mode & FXFILL_FULLCOVER), FALSE, 0,
+                          nullptr)) {
       return FALSE;
     }
   }
   int stroke_alpha = FXARGB_A(stroke_color);
   if (!pGraphState || !stroke_alpha)
     return TRUE;
 
   if (fill_mode & FX_ZEROAREA_FILL) {
     CAgg_PathData path_data;
     path_data.BuildPath(pPathData, pObject2Device);
     agg::rasterizer_scanline_aa rasterizer;
     rasterizer.clip_box(0.0f, 0.0f, (FX_FLOAT)(GetDeviceCaps(FXDC_PIXEL_WIDTH)),
                         (FX_FLOAT)(GetDeviceCaps(FXDC_PIXEL_HEIGHT)));
     RasterizeStroke(rasterizer, path_data.m_PathData, nullptr, pGraphState, 1,
-                    FALSE, fill_mode & FX_STROKE_TEXT_MODE);
-    if (!RenderRasterizer(rasterizer, stroke_color,
-                          fill_mode & FXFILL_FULLCOVER, m_bGroupKnockout, 0,
-                          nullptr)) {
-      return FALSE;
-    }
-    return TRUE;
+                    FALSE, !!(fill_mode & FX_STROKE_TEXT_MODE));
+    return RenderRasterizer(rasterizer, stroke_color,
+                            !!(fill_mode & FXFILL_FULLCOVER), m_bGroupKnockout,
+                            0, nullptr);
   }
   CFX_Matrix matrix1;
   CFX_Matrix matrix2;
   if (pObject2Device) {
     matrix1.a =
         std::max(FXSYS_fabs(pObject2Device->a), FXSYS_fabs(pObject2Device->b));
     matrix1.d = matrix1.a;
     matrix2.Set(pObject2Device->a / matrix1.a, pObject2Device->b / matrix1.a,
                 pObject2Device->c / matrix1.d, pObject2Device->d / matrix1.d, 0,
                 0);
     CFX_Matrix mtRervese;
     mtRervese.SetReverse(matrix2);
     matrix1 = *pObject2Device;
     matrix1.Concat(mtRervese);
   }
   CAgg_PathData path_data;
   path_data.BuildPath(pPathData, &matrix1);
   agg::rasterizer_scanline_aa rasterizer;
   rasterizer.clip_box(0.0f, 0.0f, (FX_FLOAT)(GetDeviceCaps(FXDC_PIXEL_WIDTH)),
                       (FX_FLOAT)(GetDeviceCaps(FXDC_PIXEL_HEIGHT)));
   RasterizeStroke(rasterizer, path_data.m_PathData, &matrix2, pGraphState,
-                  matrix1.a, FALSE, fill_mode & FX_STROKE_TEXT_MODE);
-  if (!RenderRasterizer(rasterizer, stroke_color, fill_mode & FXFILL_FULLCOVER,
-                        m_bGroupKnockout, 0, nullptr)) {
-    return FALSE;
-  }
-  return TRUE;
+                  matrix1.a, FALSE, !!(fill_mode & FX_STROKE_TEXT_MODE));
+  return RenderRasterizer(rasterizer, stroke_color,
+                          !!(fill_mode & FXFILL_FULLCOVER), m_bGroupKnockout, 0,
+                          nullptr);
 }
 
 FX_BOOL CFX_AggDeviceDriver::SetPixel(int x, int y, uint32_t color) {
   if (!m_pBitmap->GetBuffer())
     return TRUE;
 
   if (!m_pClipRgn) {
     if (!m_bRgbByteOrder)
       return DibSetPixel(m_pBitmap, x, y, color, 0, nullptr);
     RgbByteOrderSetPixel(m_pBitmap, x, y, color);
@@ skipping 214 matching lines @@
                             int height,
                             FXDIB_Format format,
                             CFX_DIBitmap* pOriDevice) {
   m_bOwnedBitmap = true;
   CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
   if (!pBitmap->Create(width, height, format)) {
     delete pBitmap;
     return false;
   }
   SetBitmap(pBitmap);
-  SetDeviceDriver(pdfium::MakeUnique<CFX_AggDeviceDriver>(pBitmap, FALSE,
-                                                          pOriDevice, FALSE));
+  SetDeviceDriver(pdfium::MakeUnique<CFX_AggDeviceDriver>(pBitmap, false,

[Tom Sepez, 2016/10/27 17:59:29]

Note: Because FALSE gets redefined by third_party headers ...

+                                                          pOriDevice, false));
   return true;
 }
 
 CFX_FxgeDevice::~CFX_FxgeDevice() {
   if (m_bOwnedBitmap) {
     delete GetBitmap();
   }
 }
 #endif