Set m_FontType in CPDF_Font() constructor.

core/include/fpdfapi/fpdf_resource.h

 // 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
 
 #ifndef _FPDF_RESOURCE_
 #define _FPDF_RESOURCE_
 #ifndef _FPDF_PARSER_
 #include "fpdf_parser.h"
@@ skipping 68 matching lines @@
 class CPDF_Font 
 {
 public:
 
     static CPDF_Font*           CreateFontF(CPDF_Document* pDoc, CPDF_Dictionary* pFontDict);
 
     static CPDF_Font*           GetStockFont(CPDF_Document* pDoc, FX_BSTR fontname);
 
     virtual ~CPDF_Font();
 
-
-
-
-    int                                         GetFontType() const
-    {
-        return m_FontType;
-    }
+    bool IsFontType(int fonttype) const { return fonttype == m_FontType; }
+    int GetFontType() const { return m_FontType;  }
 
     CFX_ByteString                      GetFontTypeName() const;
 
     const CFX_ByteString&       GetBaseFont() const
     {
         return m_BaseFont;
     }
 
     const CFX_SubstFont*        GetSubstFont() const
     {
@@ skipping 143 matching lines @@
 
     virtual void                        GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level = 0) = 0;
 
 
 
     CPDF_Document*                      m_pDocument;
 
     class CFX_PathData*         LoadGlyphPath(FX_DWORD charcode, int dest_width = 0);
 
     CFX_Font                            m_Font;
+
 protected:
-
-    CPDF_Font();
+    CPDF_Font(int fonttype);

[Lei Zhang, 2015/04/17 19:40:59]

explicit, also CPDF_SimpleFont below

[Tom Sepez, 2015/04/17 19:50:26]

Done.

 
     FX_BOOL                                     Initialize();
 
     FX_BOOL                                     Load();
 
     virtual FX_BOOL                     _Load() = 0;
 
     virtual FX_WCHAR            _UnicodeFromCharCode(FX_DWORD charcode) const = 0;
 
     virtual FX_DWORD            _CharCodeFromUnicode(FX_WCHAR Unicode) const = 0;
 
     void                                        LoadUnicodeMap();
 
     void                                        LoadPDFEncoding(CPDF_Object* pEncoding, int& iBaseEncoding,
                                             CFX_ByteString*& pCharNames, FX_BOOL bEmbedded, FX_BOOL bTrueType);
 
     void                                        LoadFontDescriptor(CPDF_Dictionary*);
 
     void                                        LoadCharWidths(FX_WORD* pWidths);
 
     void                                        CheckFontMetrics();
 
     CFX_CharMap*                        m_pCharMap;
 
 
 
-    int                                         m_FontType;
-
     CFX_ByteString                      m_BaseFont;
 
     CPDF_StreamAcc*                     m_pFontFile;
 
     CPDF_Dictionary*            m_pFontDict;
 
     CPDF_ToUnicodeMap*          m_pToUnicodeMap;
 
     FX_BOOL                                     m_bToUnicodeLoaded;
 
 
 
 
     int                                         m_Flags;
 
     FX_RECT                                     m_FontBBox;
 
     int                                         m_StemV;
 
     int                                         m_Ascent;
 
     int                                         m_Descent;
 
     int                                         m_ItalicAngle;
 
+private:
+    int                                         m_FontType;

[Lei Zhang, 2015/04/17 19:40:59]

This can be const since we never change it, right?

[Tom Sepez, 2015/04/17 19:50:26]

Done.

 };
 #define PDFFONT_ENCODING_BUILTIN                0
 #define PDFFONT_ENCODING_WINANSI                1
 #define PDFFONT_ENCODING_MACROMAN               2
 #define PDFFONT_ENCODING_MACEXPERT              3
 #define PDFFONT_ENCODING_STANDARD               4
 #define PDFFONT_ENCODING_ADOBE_SYMBOL   5
 #define PDFFONT_ENCODING_ZAPFDINGBATS   6
 #define PDFFONT_ENCODING_PDFDOC                 7
 #define PDFFONT_ENCODING_MS_SYMBOL              8
@@ skipping 23 matching lines @@
     }
 
     CPDF_Object*                        Realize();
 public:
 
     FX_WCHAR                            m_Unicodes[256];
 };
 class CPDF_SimpleFont : public CPDF_Font
 {
 public:
-
-    CPDF_SimpleFont();
+    CPDF_SimpleFont(int fonttype);
 
     virtual ~CPDF_SimpleFont();
 
     CPDF_FontEncoding*          GetEncoding()
     {
         return &m_Encoding;
     }
     virtual int                         GetCharWidthF(FX_DWORD charcode, int level = 0);
     virtual void                        GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level = 0);
     virtual int                         GlyphFromCharCode(FX_DWORD charcode, FX_BOOL *pVertGlyph = NULL);
@@ skipping 579 matching lines @@
     FX_BOOL                                     m_bIsMask;
 
     FX_BOOL                                     m_bInterpolate;
 
     CPDF_Document*                      m_pDocument;
 
     CPDF_Dictionary*            m_pOC;
     CPDF_Dictionary*    InitJPEG(FX_LPBYTE pData, FX_DWORD size);
 };
 #endif