Set m_FontType in CPDF_Font() constructor.

core/src/fpdfapi/fpdf_font/fpdf_font.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 "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "font_int.h"
@@ skipping 95 matching lines @@
 {
     FX_POSITION pos = m_pStockMap.GetStartPosition();
     while (pos) {
         void* key = NULL;
         void* value = NULL;
         m_pStockMap.GetNextAssoc(pos, key, value);
         delete static_cast<CFX_StockFontArray*>(value);
         m_pStockMap.RemoveKey(key);
     }
 }
-CPDF_Font::CPDF_Font()
+CPDF_Font::CPDF_Font(int fonttype) : m_FontType(fonttype)
 {
-    m_FontType = 0;
     m_FontBBox.left = m_FontBBox.right = m_FontBBox.top = m_FontBBox.bottom = 0;
     m_StemV = m_Ascent = m_Descent = m_ItalicAngle = 0;
     m_pFontFile = NULL;
     m_Flags = 0;
     m_pToUnicodeMap = NULL;
     m_bToUnicodeLoaded = FALSE;
-    m_pCharMap = NULL;
-}
-FX_BOOL CPDF_Font::Initialize()
-{
     m_pCharMap = new CPDF_FontCharMap(this);
-    return TRUE;
 }
 CPDF_Font::~CPDF_Font()
 {
     delete m_pCharMap;
     m_pCharMap = NULL;
 
     delete m_pToUnicodeMap;
     m_pToUnicodeMap = NULL;
 
     if (m_pFontFile) {
@@ skipping 297 matching lines @@
             int count = sizeof(ChineseFontNames) / sizeof(ChineseFontNames[0]);
             for (i = 0; i < count; ++i) {
                 if (tag == CFX_ByteString((FX_LPCSTR)ChineseFontNames[i])) {
                     break;
                 }
             }
             if (i < count) {
                 CPDF_Dictionary* pFontDesc = pFontDict->GetDict(FX_BSTRC("FontDescriptor"));
                 if (pFontDesc == NULL || !pFontDesc->KeyExist(FX_BSTRC("FontFile2"))) {
                     pFont = new CPDF_CIDFont;
-                    pFont->Initialize();
-                    pFont->m_FontType = PDFFONT_CIDFONT;
                     pFont->m_pFontDict = pFontDict;
                     pFont->m_pDocument = pDoc;
                     if (!pFont->Load()) {
                         delete pFont;
                         return NULL;
                     }
                     return pFont;
                 }
             }
 #endif
         }
         pFont = new CPDF_TrueTypeFont;
-        pFont->Initialize();
-        pFont->m_FontType = PDFFONT_TRUETYPE;
     } else if (type == FX_BSTRC("Type3")) {
         pFont = new CPDF_Type3Font;
-        pFont->Initialize();
-        pFont->m_FontType = PDFFONT_TYPE3;
     } else if (type == FX_BSTRC("Type0")) {
         pFont = new CPDF_CIDFont;
-        pFont->Initialize();
-        pFont->m_FontType = PDFFONT_CIDFONT;
     } else {
         pFont = new CPDF_Type1Font;
-        pFont->Initialize();
-        pFont->m_FontType = PDFFONT_TYPE1;
     }
     pFont->m_pFontDict = pFontDict;
     pFont->m_pDocument = pDoc;
     if (!pFont->Load()) {
         delete pFont;
         return NULL;
     }
     return pFont;
 }
 FX_BOOL CPDF_Font::Load()
@@ skipping 340 matching lines @@
     }
     if (m_pFontFile != NULL) {
         return FALSE;
     }
     if (((CPDF_Type1Font*)this)->GetBase14Font() < 0) {
         return FALSE;
     }
     return TRUE;
 }
 extern FX_LPCSTR PDF_CharNameFromPredefinedCharSet(int encoding, FX_BYTE charcode);
-CPDF_SimpleFont::CPDF_SimpleFont()
+CPDF_SimpleFont::CPDF_SimpleFont(int fonttype) : CPDF_Font(fonttype)
 {
     FXSYS_memset8(m_CharBBox, 0xff, sizeof m_CharBBox);
     FXSYS_memset8(m_CharWidth, 0xff, sizeof m_CharWidth);
     FXSYS_memset8(m_GlyphIndex, 0xff, sizeof m_GlyphIndex);
     FXSYS_memset8(m_ExtGID, 0xff, sizeof m_ExtGID);
     m_pCharNames = NULL;
     m_BaseEncoding = PDFFONT_ENCODING_BUILTIN;
 }
 CPDF_SimpleFont::~CPDF_SimpleFont()
 {
@@ skipping 177 matching lines @@
                 width = m_CharWidth[i];
             } else if (width != m_CharWidth[i]) {
                 break;
             }
         }
         if (i == 256 && width) {
             m_Flags |= PDFFONT_FIXEDPITCH;
         }
     }
     int weight = m_StemV < 140 ? m_StemV * 5 : (m_StemV * 4 + 140);
-    m_Font.LoadSubst(m_BaseFont, m_FontType == PDFFONT_TRUETYPE, m_Flags, weight, m_ItalicAngle, 0);
+    m_Font.LoadSubst(m_BaseFont, IsFontType(PDFFONT_TRUETYPE), m_Flags, weight, m_ItalicAngle, 0);
     if (m_Font.m_pSubstFont->m_SubstFlags & FXFONT_SUBST_NONSYMBOL) {
     }
 }
 FX_BOOL CPDF_SimpleFont::IsUnicodeCompatible() const
 {
     return m_BaseEncoding != PDFFONT_ENCODING_BUILTIN && m_BaseEncoding != PDFFONT_ENCODING_ADOBE_SYMBOL &&
            m_BaseEncoding != PDFFONT_ENCODING_ZAPFDINGBATS;
 }
-CPDF_Type1Font::CPDF_Type1Font()
+CPDF_Type1Font::CPDF_Type1Font() : CPDF_SimpleFont(PDFFONT_TYPE1)
 {
     m_Base14Font = -1;
 }
 FX_BOOL CPDF_Type1Font::_Load()
 {
     m_Base14Font = _PDF_GetStandardFontName(m_BaseFont);
     if (m_Base14Font >= 0) {
         CPDF_Dictionary* pFontDesc = m_pFontDict->GetDict(FX_BSTRC("FontDescriptor"));
         if (pFontDesc && pFontDesc->KeyExist(FX_BSTRC("Flags"))) {
             m_Flags = pFontDesc->GetInteger(FX_BSTRC("Flags"));
@@ skipping 371 matching lines @@
     for (int i = 0; i < 256; i ++) {
         if (pStandard[i] == m_Unicodes[i]) {
             continue;
         }
         pDiff->Add(CPDF_Number::Create(i));
         pDiff->Add(CPDF_Name::Create(PDF_AdobeNameFromUnicode(m_Unicodes[i])));
     }
     pDict->SetAt(FX_BSTRC("Differences"), pDiff);
     return pDict;
 }
-CPDF_TrueTypeFont::CPDF_TrueTypeFont()
+CPDF_TrueTypeFont::CPDF_TrueTypeFont() : CPDF_SimpleFont(PDFFONT_TRUETYPE)
 {
 }
 FX_BOOL CPDF_TrueTypeFont::_Load()
 {
     return LoadCommon();
 }
 extern FX_DWORD FT_CharCodeFromUnicode(int encoding, FX_WCHAR unicode);
 void CPDF_TrueTypeFont::LoadGlyphMap()
 {
     if (m_Font.m_Face == NULL) {
@@ skipping 161 matching lines @@
             }
         }
         if (bGotOne) {
             return;
         }
     }
     for (int charcode = 0; charcode < 256; charcode ++) {
         m_GlyphIndex[charcode] = charcode;
     }
 }
-CPDF_Type3Font::CPDF_Type3Font()
+CPDF_Type3Font::CPDF_Type3Font() : CPDF_SimpleFont(PDFFONT_TYPE3)
 {
     m_pPageResources = NULL;
     FXSYS_memset32(m_CharWidthL, 0, sizeof m_CharWidthL);
 }
 CPDF_Type3Font::~CPDF_Type3Font()
 {
     FX_POSITION pos = m_CacheMap.GetStartPosition();
     while (pos) {
         FX_LPVOID key, value;
         m_CacheMap.GetNextAssoc(pos, key, value);
@@ skipping 134 matching lines @@
 }
 CPDF_Type3Char::~CPDF_Type3Char()
 {
     if (m_pForm) {
         delete m_pForm;
     }
     if (m_pBitmap) {
         delete m_pBitmap;
     }
 }