Remove FX_BOOL from cpdf_font

core/fpdfapi/fpdf_font/fpdf_font_cid.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/fpdfapi/fpdf_font/font_int.h"
 
 #include "core/fpdfapi/fpdf_cmaps/cmap_int.h"
 #include "core/fpdfapi/fpdf_font/ttgsubtable.h"
@@ skipping 387 matching lines @@
     }
     m_CodeSeq = 0;
   } else if (m_Status == 3) {
     m_Status = 0;
   } else if (m_Status == 4) {
     m_pCMap->m_Charset = CharsetFromOrdering(CMap_GetString(word));
     m_Status = 0;
   } else if (m_Status == 5) {
     m_Status = 0;
   } else if (m_Status == 6) {
-    m_pCMap->m_bVertical = CMap_GetCode(word);
+    m_pCMap->m_bVertical = CMap_GetCode(word) != 0;
     m_Status = 0;
   } else if (m_Status == 7) {
     if (word == "endcodespacerange") {
       int nSegs = m_CodeRanges.GetSize();
       if (nSegs > 1) {
         m_pCMap->m_CodingScheme = CPDF_CMap::MixedFourBytes;
         m_pCMap->m_nCodeRanges = nSegs;
         m_pCMap->m_pLeadingBytes =
             FX_Alloc2D(uint8_t, nSegs, sizeof(CMap_CodeRange));
         FXSYS_memcpy(m_pCMap->m_pLeadingBytes, m_CodeRanges.GetData(),
@@ skipping 73 matching lines @@
                          : '0';
     range.m_Upper[i] = FXSYS_toHexDigit(digit1) * 16 + FXSYS_toHexDigit(digit2);
   }
   return true;
 }
 
 CPDF_CMap::CPDF_CMap() {
   m_Charset = CIDSET_UNKNOWN;
   m_Coding = CIDCODING_UNKNOWN;
   m_CodingScheme = TwoBytes;
-  m_bVertical = 0;
+  m_bVertical = false;
   m_bLoaded = FALSE;

[Lei Zhang, 2016/09/23 23:52:39]

Saving this for later?

   m_pMapping = nullptr;
   m_pLeadingBytes = nullptr;
   m_pAddMapping = nullptr;
   m_pEmbedMap = nullptr;
   m_nCodeRanges = 0;
 }
 CPDF_CMap::~CPDF_CMap() {
   FX_Free(m_pMapping);
   FX_Free(m_pAddMapping);
   FX_Free(m_pLeadingBytes);
 }
 
 FX_BOOL CPDF_CMap::IsLoaded() const {
   return m_bLoaded;
 }
 
-FX_BOOL CPDF_CMap::IsVertWriting() const {
+bool CPDF_CMap::IsVertWriting() const {
   return m_bVertical;
 }
 
 FX_BOOL CPDF_CMap::LoadPredefined(CPDF_CMapManager* pMgr,
                                   const CFX_ByteString& bsName,
                                   FX_BOOL bPromptCJK) {
   m_PredefinedCMap = bsName;
   if (m_PredefinedCMap == "Identity-H" || m_PredefinedCMap == "Identity-V") {
     m_Coding = CIDCODING_CID;
     m_bVertical = bsName[9] == 'V';
@@ skipping 249 matching lines @@
   m_EmbeddedCount = pFontGlobals->m_EmbeddedToUnicodes[charset].m_Count;
 }
 
 CIDSet CharsetFromOrdering(const CFX_ByteStringC& ordering) {
   for (size_t charset = 1; charset < FX_ArraySize(g_CharsetNames); ++charset) {
     if (ordering == g_CharsetNames[charset])
       return CIDSetFromSizeT(charset);
   }
   return CIDSET_UNKNOWN;
 }