From 3c949d5d2b0d680839766ea99c86b263230b263d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 Jun 2015 10:40:57 -0700 Subject: Convert CPDF_FontMap to std::map. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1151133004. --- core/include/fpdfapi/fpdf_resource.h | 56 +++++++++++++++++------------------- 1 file changed, 27 insertions(+), 29 deletions(-) (limited to 'core/include/fpdfapi') diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h index 06dcdfec44..054e90a158 100644 --- a/core/include/fpdfapi/fpdf_resource.h +++ b/core/include/fpdfapi/fpdf_resource.h @@ -1,7 +1,7 @@ // 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 CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_ @@ -10,40 +10,39 @@ #include "../fxge/fx_font.h" #include "fpdf_parser.h" -class CPDF_Font; -class CPDF_Type1Font; -class CPDF_TrueTypeFont; +class CFX_CTTGSUBTable; +class CFX_DIBitmap; +class CFX_Font; +class CFX_SubstFont; +class CPDF_CID2UnicodeMap; class CPDF_CIDFont; -class CPDF_Type3Font; -class CPDF_FontEncoding; class CPDF_CMap; -class CPDF_CID2UnicodeMap; -class CPDF_ColorSpace; class CPDF_Color; +class CPDF_ColorSpace; +class CPDF_Face; +class CPDF_Font; +class CPDF_FontEncoding; +class CPDF_Form; class CPDF_Function; +class CPDF_Image; +class CPDF_ImageObject; +class CPDF_Page; class CPDF_Pattern; -class CPDF_TilingPattern; +class CPDF_RenderContext; class CPDF_ShadingPattern; -class CPDF_Image; -class CPDF_Face; +class CPDF_TilingPattern; class CPDF_ToUnicodeMap; -class CFX_SubstFont; -class CFX_Font; -class CPDF_RenderContext; -class CPDF_Form; -class CPDF_ImageObject; -class CFX_DIBitmap; +class CPDF_TrueTypeFont; +class CPDF_Type1Font; +class CPDF_Type3Font; typedef struct FT_FaceRec_* FXFT_Face; -class CFX_CTTGSUBTable; -class CPDF_Page; -template class CPDF_CountedObject +template class CPDF_CountedObject { public: ObjClass m_Obj; FX_DWORD m_nCount; }; -typedef CPDF_CountedObject CPDF_CountedFont; typedef CPDF_CountedObject CPDF_CountedColorSpace; typedef CPDF_CountedObject CPDF_CountedPattern; typedef CPDF_CountedObject CPDF_CountedImage; @@ -51,7 +50,6 @@ typedef CPDF_CountedObject CPDF_CountedICCProfile; typedef CPDF_CountedObject CPDF_CountedStreamAcc; -typedef CFX_MapPtrTemplate CPDF_FontMap; typedef CFX_MapPtrTemplate CPDF_ColorSpaceMap; typedef CFX_MapPtrTemplate CPDF_PatternMap; typedef CFX_MapPtrTemplate CPDF_ImageMap; @@ -314,7 +312,7 @@ private: #define PDFFONT_ENCODING_PDFDOC 7 #define PDFFONT_ENCODING_MS_SYMBOL 8 #define PDFFONT_ENCODING_UNICODE 9 -class CPDF_FontEncoding +class CPDF_FontEncoding { public: @@ -427,7 +425,7 @@ protected: virtual FX_BOOL _Load(); virtual void LoadGlyphMap(); }; -class CPDF_Type3Char +class CPDF_Type3Char { public: @@ -667,7 +665,7 @@ protected: FX_DWORD m_dwStdConversion; }; -class CPDF_Color +class CPDF_Color { public: @@ -716,10 +714,10 @@ protected: }; #define PATTERN_TILING 1 #define PATTERN_SHADING 2 -class CPDF_Pattern +class CPDF_Pattern { public: - + virtual ~CPDF_Pattern(); void SetForceClear(FX_BOOL bForceClear) { m_bForceClear = bForceClear; } @@ -793,7 +791,7 @@ struct CPDF_MeshVertex { FX_FLOAT x, y; FX_FLOAT r, g, b; }; -class CPDF_MeshStream +class CPDF_MeshStream { public: @@ -833,7 +831,7 @@ public: FX_ARGB* pMatteColor; int32_t nQuality; }; -class CPDF_Image +class CPDF_Image { public: -- cgit v1.2.3