Fix and enable lint checks.

core/src/fxge/dib/fx_dib_convert.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/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
 #include "core/include/fxge/fx_ge.h"
 
@@ skipping 371 matching lines @@
                                   256);
   } else {
     if (pSrcBitmap->IsCmykImage()) {
       uint8_t r, g, b;
       for (int i = 0; i < 256; i++) {
         AdobeCMYK_to_sRGB1(
             FXSYS_GetCValue(src_plt[i]), FXSYS_GetMValue(src_plt[i]),
             FXSYS_GetYValue(src_plt[i]), FXSYS_GetKValue(src_plt[i]), r, g, b);
         gray[i] = FXRGB2GRAY(r, g, b);
       }
-    } else
+    } else {
       for (int i = 0; i < 256; i++) {
         gray[i] = FXRGB2GRAY(FXARGB_R(src_plt[i]), FXARGB_G(src_plt[i]),
                              FXARGB_B(src_plt[i]));
       }
+    }
   }
   for (int row = 0; row < height; row++) {
     uint8_t* dest_scan = dest_buf + row * dest_pitch;
     const uint8_t* src_scan = pSrcBitmap->GetScanline(src_top + row) + src_left;
     for (int col = 0; col < width; col++) {
       *dest_scan++ = gray[*src_scan++];
     }
   }
   return TRUE;
 }
@@ skipping 690 matching lines @@
   FX_BOOL ret = TRUE;
   CFX_DIBitmap* pSrcAlpha = NULL;
   if (HasAlpha()) {
     pSrcAlpha = (GetFormat() == FXDIB_Argb) ? GetAlphaMask() : m_pAlphaMask;
     if (!pSrcAlpha) {
       delete pClone;
       return NULL;
     }
   }
   if (dest_format & 0x0200) {
-    if (dest_format == FXDIB_Argb)
+    if (dest_format == FXDIB_Argb) {
       ret = pSrcAlpha ? pClone->LoadChannel(FXDIB_Alpha, pSrcAlpha, FXDIB_Alpha)
                       : pClone->LoadChannel(FXDIB_Alpha, 0xff);
-    else {
+    } else {
       ret = pClone->CopyAlphaMask(pSrcAlpha);
     }
   }
   if (pSrcAlpha && pSrcAlpha != m_pAlphaMask) {
     delete pSrcAlpha;
     pSrcAlpha = NULL;
   }
   if (!ret) {
     delete pClone;
     return NULL;
@@ skipping 96 matching lines @@
   if (!m_bExtBuf) {
     FX_Free(m_pBuffer);
   }
   m_bExtBuf = FALSE;
   m_pBuffer = dest_buf;
   m_bpp = (uint8_t)dest_format;
   m_AlphaFlag = (uint8_t)(dest_format >> 8);
   m_Pitch = dest_pitch;
   return TRUE;
 }