Fix and enable lint checks.

core/src/fxge/dib/fx_dib_main.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/include/fxge/fx_dib.h"
 
 #include <limits.h>
 
@@ skipping 452 matching lines @@
     alpha = FXARGB_A(color);
     dst_color = FXARGB_TODIB(color);
   }
   uint8_t* color_p = (uint8_t*)&dst_color;
   if (pIccTransform && CFX_GEModule::Get()->GetCodecModule() &&
       CFX_GEModule::Get()->GetCodecModule()->GetIccModule()) {
     ICodec_IccModule* pIccModule =
         CFX_GEModule::Get()->GetCodecModule()->GetIccModule();
     pIccModule->TranslateScanline(pIccTransform, color_p, color_p, 1);
   } else {
-    if (alpha_flag >> 8 && !IsCmykImage())
+    if (alpha_flag >> 8 && !IsCmykImage()) {
       AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color),
                          FXSYS_GetYValue(color), FXSYS_GetKValue(color),
                          color_p[2], color_p[1], color_p[0]);
-    else if (!(alpha_flag >> 8) && IsCmykImage()) {
+    } else if (!(alpha_flag >> 8) && IsCmykImage()) {
       return FALSE;
     }
   }
   if (!IsCmykImage()) {
     color_p[3] = (uint8_t)alpha;
   }
   if (GetFormat() == FXDIB_Argb) {
     for (int row = 0; row < height; row++) {
       FX_DWORD* dest_pos =
           (FX_DWORD*)(m_pBuffer + (dest_top + row) * m_Pitch + dest_left * 4);
@@ skipping 208 matching lines @@
       return FALSE;
     }
     if (GetBPP() < 24) {
       if (HasAlpha()) {
         if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyka : FXDIB_Argb)) {
           if (pSrcClone != pSrcBitmap) {
             delete pSrcClone;
           }
           return FALSE;
         }
-      } else
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-          if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) {
+      } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) {
 #else
-          if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) {
+      } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) {
 #endif
         if (pSrcClone != pSrcBitmap) {
           delete pSrcClone;
         }
         return FALSE;
       }
     }
     destOffset = g_ChannelOffset[destChannel];
   }
   if (srcChannel == FXDIB_Alpha && pSrcClone->m_pAlphaMask) {
@@ skipping 69 matching lines @@
     }
   } else {
     if (IsAlphaMask()) {
       return FALSE;
     }
     if (GetBPP() < 24) {
       if (HasAlpha()) {
         if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyka : FXDIB_Argb)) {
           return FALSE;
         }
-      } else
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
-          if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) {
+      } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb)) {
+#else
+      } else if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) {
+#endif
         return FALSE;
       }
-#else
-          if (!ConvertFormat(IsCmykImage() ? FXDIB_Cmyk : FXDIB_Rgb32)) {
-        return FALSE;
-      }
-#endif
     }
     destOffset = g_ChannelOffset[destChannel];
   }
   int Bpp = GetBPP() / 8;
   if (Bpp == 1) {
     FXSYS_memset(m_pBuffer, value, m_Height * m_Pitch);
     return TRUE;
   }
   if (destChannel == FXDIB_Alpha && m_pAlphaMask) {
     FXSYS_memset(m_pAlphaMask->GetBuffer(), value,
@@ skipping 437 matching lines @@
         uint8_t b, g, r;
         AdobeCMYK_to_sRGB1(FXSYS_GetCValue(m_pPalette[i]),
                            FXSYS_GetMValue(m_pPalette[i]),
                            FXSYS_GetYValue(m_pPalette[i]),
                            FXSYS_GetKValue(m_pPalette[i]), r, g, b);
         int gray = 255 - FXRGB2GRAY(r, g, b);
         m_pPalette[i] = CmykEncode(
             bc + (fc - bc) * gray / 255, bm + (fm - bm) * gray / 255,
             by + (fy - by) * gray / 255, bk + (fk - bk) * gray / 255);
       }
-    } else
+    } else {
       for (int i = 0; i < size; i++) {
         int gray = FXRGB2GRAY(FXARGB_R(m_pPalette[i]), FXARGB_G(m_pPalette[i]),
                               FXARGB_B(m_pPalette[i]));
         m_pPalette[i] = FXARGB_MAKE(0xff, br + (fr - br) * gray / 255,
                                     bg + (fg - bg) * gray / 255,
                                     bb + (fb - bb) * gray / 255);
       }
+    }
     return TRUE;
   }
   if (isCmykImage) {
     if (forecolor == 0xff && backcolor == 0x00) {
       for (int row = 0; row < m_Height; row++) {
         uint8_t* scanline = m_pBuffer + row * m_Pitch;
         for (int col = 0; col < m_Width; col++) {
           uint8_t b, g, r;
           AdobeCMYK_to_sRGB1(scanline[0], scanline[1], scanline[2], scanline[3],
                              r, g, b);
@@ skipping 430 matching lines @@
   if (!m_pBitmap->Create(width, height, src_format)) {
     delete m_pBitmap;
     m_pBitmap = NULL;
     return FALSE;
   }
   if (pSrcPalette) {
     m_pBitmap->CopyPalette(pSrcPalette);
   }
   return TRUE;
 }