diff options
Diffstat (limited to 'core/src/fpdfapi')
-rw-r--r-- | core/src/fpdfapi/fpdf_edit/editint.h | 4 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_font/font_int.h | 14 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 2 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_font/ttgsubtable.h | 4 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp | 4 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 16 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp | 2 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 2 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 24 |
9 files changed, 36 insertions, 36 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h index 6346f06136..73b28e3735 100644 --- a/core/src/fpdfapi/fpdf_edit/editint.h +++ b/core/src/fpdfapi/fpdf_edit/editint.h @@ -6,7 +6,7 @@ #ifndef _FPDF_EDITINT_ #define _FPDF_EDITINT_ -class CPDF_ObjectStream : public CFX_Object +class CPDF_ObjectStream { public: CPDF_ObjectStream(); @@ -27,7 +27,7 @@ protected: CFX_DWordArray m_OffsetArray; }; -class CPDF_XRefStream : public CFX_Object +class CPDF_XRefStream { public: diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index 43f4e302af..a2d544afe9 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com typedef void* FXFT_Library; -class CPDF_CMapManager : public CFX_Object +class CPDF_CMapManager { public: CPDF_CMapManager(); @@ -22,7 +22,7 @@ private: CFX_MapByteStringToPtr m_CMaps; CPDF_CID2UnicodeMap* m_CID2UnicodeMaps[6]; }; -class CPDF_FontGlobals : public CFX_Object +class CPDF_FontGlobals { public: CPDF_FontGlobals(); @@ -48,7 +48,7 @@ struct _CMap_CodeRange { FX_BYTE m_Lower[4]; FX_BYTE m_Upper[4]; }; -class CPDF_CMapParser : public CFX_Object +class CPDF_CMapParser { public: CPDF_CMapParser(); @@ -73,7 +73,7 @@ private: #define CIDCODING_UCS2 5 #define CIDCODING_CID 6 #define CIDCODING_UTF16 7 -class CPDF_CMap : public CFX_Object +class CPDF_CMap { public: CPDF_CMap(); @@ -138,7 +138,7 @@ typedef struct _FileHeader { FX_DWORD dwDataOffset; FX_DWORD dwRecordSize; } FXMP_FILEHEADER; -class CPDF_CID2UnicodeMap : public CFX_Object +class CPDF_CID2UnicodeMap { public: CPDF_CID2UnicodeMap(); @@ -152,7 +152,7 @@ protected: const FX_WORD* m_pEmbeddedMap; FX_DWORD m_EmbeddedCount; }; -class CPDF_ToUnicodeMap : public CFX_Object +class CPDF_ToUnicodeMap { public: void Load(CPDF_Stream* pStream); @@ -163,7 +163,7 @@ protected: CPDF_CID2UnicodeMap* m_pBaseMap; CFX_WideTextBuf m_MultiCharBuf; }; -class CPDF_FontCharMap : public CFX_CharMap, public CFX_Object +class CPDF_FontCharMap : public CFX_CharMap { public: CPDF_FontCharMap(CPDF_Font* pFont); diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 41bb95a89d..91d4010b80 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -35,7 +35,7 @@ CPDF_FontGlobals::~CPDF_FontGlobals() FX_Free(m_pContrastRamps); } } -class CFX_StockFontArray : public CFX_Object +class CFX_StockFontArray { public: CFX_StockFontArray() diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h index 6b1b4f2443..d231c13ca2 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h @@ -19,7 +19,7 @@ public: protected: CFX_BinaryBuf m_Buffer; }; -class CFX_CTTGSUBTable : public CFX_Object +class CFX_CTTGSUBTable { public: CFX_CTTGSUBTable(void): m_bFeautureMapLoad(FALSE), loaded(false) {}; @@ -406,7 +406,7 @@ private: struct TFeatureList FeatureList; struct TLookupList LookupList; }; -class CFX_GSUBTable FX_FINAL : public IFX_GSUBTable, public CFX_Object +class CFX_GSUBTable FX_FINAL : public IFX_GSUBTable { public: virtual void Release() FX_OVERRIDE diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index ae912ac50f..c786df5a5b 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -21,7 +21,7 @@ typedef enum {PSOP_ADD, PSOP_SUB, PSOP_MUL, PSOP_DIV, PSOP_IDIV, PSOP_MOD, PSOP_IF, PSOP_IFELSE, PSOP_POP, PSOP_EXCH, PSOP_DUP, PSOP_COPY, PSOP_INDEX, PSOP_ROLL, PSOP_PROC, PSOP_CONST } PDF_PSOP; -class CPDF_PSProc : public CFX_Object +class CPDF_PSProc { public: ~CPDF_PSProc(); @@ -30,7 +30,7 @@ public: CFX_PtrArray m_Operators; }; #define PSENGINE_STACKSIZE 100 -class CPDF_PSEngine : public CFX_Object +class CPDF_PSEngine { public: CPDF_PSEngine(); diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 9048fb7874..73c6ec4121 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -11,7 +11,7 @@ #define PARSE_STEP_LIMIT 100 #define STREAM_PARSE_BUFSIZE 20480 class CPDF_QuickFontCache; -class CPDF_StreamParser : public CFX_Object +class CPDF_StreamParser { public: @@ -118,7 +118,7 @@ typedef struct { #define _FPDF_MAX_FORM_LEVEL_ 30 #define _FPDF_MAX_TYPE3_FORM_LEVEL_ 4 #define _FPDF_MAX_OBJECT_STACK_SIZE_ 512 -class CPDF_StreamContentParser : public CFX_Object +class CPDF_StreamContentParser { public: CPDF_StreamContentParser(); @@ -280,7 +280,7 @@ public: void Handle_NextLineShowText_Space(); void Handle_Invalid(); }; -class CPDF_ContentParser : public CFX_Object +class CPDF_ContentParser { public: CPDF_ContentParser(); @@ -359,7 +359,7 @@ FX_BOOL PDF_DocPageData_Release(CFX_MapPtrTemplate<KeyType, CPDF_CountedObject<V } return FALSE; } -class CPDF_DocPageData : public CFX_Object +class CPDF_DocPageData { public: CPDF_DocPageData(CPDF_Document *pPDFDoc); @@ -393,7 +393,7 @@ public: CPDF_FontFileMap m_FontFileMap; FX_BOOL m_bForceClear; }; -class CPDF_Function : public CFX_Object +class CPDF_Function { public: static CPDF_Function* Load(CPDF_Object* pFuncObj); @@ -416,7 +416,7 @@ protected: virtual FX_BOOL v_Init(CPDF_Object* pObj) = 0; virtual FX_BOOL v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const = 0; }; -class CPDF_IccProfile : public CFX_Object +class CPDF_IccProfile { public: CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize); @@ -451,10 +451,10 @@ public: CPDF_CountedColorSpace* m_pCountedBaseCS; }; #define MAX_PAGE_OBJECTS_UNIFY_NAMING 4096 -class CPDF_ResourceNaming : public CFX_Object +class CPDF_ResourceNaming { public: - struct _NamingState : public CFX_Object { + struct _NamingState { CFX_ByteString m_Prefix; int m_nIndex; }; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp index b6d6dc70c0..4fb9b4db13 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp @@ -54,7 +54,7 @@ CPDF_CryptoHandler* CPDF_StandardSecurityHandler::CreateCryptoHandler() { return FX_NEW CPDF_StandardCryptoHandler; } -typedef struct _PDF_CRYPTOITEM : public CFX_Object { +typedef struct _PDF_CRYPTOITEM { FX_INT32 m_Cipher; FX_INT32 m_KeyLen; FX_BOOL m_bChecked; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 5a7837dc71..792846ea34 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -2728,7 +2728,7 @@ void CPDF_SyntaxParser::GetBinary(FX_BYTE* buffer, FX_DWORD size) } } -class CPDF_DataAvail FX_FINAL : public CFX_Object, public IPDF_DataAvail +class CPDF_DataAvail FX_FINAL : public IPDF_DataAvail { public: CPDF_DataAvail(IFX_FileAvail* pFileAvail, IFX_FileRead* pFileRead); diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index 5606562bf3..086a1c24b2 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -9,7 +9,7 @@ #endif class CPDF_QuickStretcher; #define TYPE3_MAX_BLUES 16 -class CPDF_Type3Glyphs : public CFX_Object +class CPDF_Type3Glyphs { public: CPDF_Type3Glyphs() @@ -25,7 +25,7 @@ public: int m_TopBlueCount, m_BottomBlueCount; }; class CFX_GlyphBitmap; -class CPDF_Type3Cache : public CFX_Object +class CPDF_Type3Cache { public: CPDF_Type3Cache(CPDF_Type3Font* pFont) @@ -39,7 +39,7 @@ protected: CPDF_Type3Font* m_pFont; CFX_MapByteStringToPtr m_SizeMap; }; -class CPDF_TransferFunc : public CFX_Object +class CPDF_TransferFunc { public: CPDF_Document* m_pPDFDoc; @@ -51,7 +51,7 @@ public: }; typedef CFX_MapPtrTemplate<CPDF_Font*, CPDF_CountedObject<CPDF_Type3Cache*>*> CPDF_Type3CacheMap; typedef CFX_MapPtrTemplate<CPDF_Object*, CPDF_CountedObject<CPDF_TransferFunc*>*> CPDF_TransferFuncMap; -class CPDF_DocRenderData : public CFX_Object +class CPDF_DocRenderData { public: CPDF_DocRenderData(CPDF_Document* pPDFDoc = NULL); @@ -78,7 +78,7 @@ public: CFX_AffineMatrix m_Matrix; }; typedef CFX_ArrayTemplate<_PDF_RenderItem> CPDF_RenderLayer; -class IPDF_ObjectRenderer : public CFX_Object +class IPDF_ObjectRenderer { public: static IPDF_ObjectRenderer* Create(int type); @@ -87,7 +87,7 @@ public: virtual FX_BOOL Continue(IFX_Pause* pPause) = 0; FX_BOOL m_Result; }; -class CPDF_RenderStatus : public CFX_Object +class CPDF_RenderStatus { public: CPDF_RenderStatus(); @@ -179,7 +179,7 @@ protected: FX_ARGB m_T3FillColor; int m_curBlend; }; -class CPDF_ImageLoader : public CFX_Object +class CPDF_ImageLoader { public: CPDF_ImageLoader() @@ -205,7 +205,7 @@ protected: FX_INT32 m_nDownsampleWidth; FX_INT32 m_nDownsampleHeight; }; -class CPDF_ProgressiveImageLoaderHandle : public CFX_Object +class CPDF_ProgressiveImageLoaderHandle { public: CPDF_ProgressiveImageLoaderHandle(); @@ -258,7 +258,7 @@ protected: FX_BOOL DrawMaskedImage(); FX_BOOL DrawPatternImage(const CFX_Matrix* pObj2Device); }; -class CPDF_ScaledRenderBuffer : public CFX_Object +class CPDF_ScaledRenderBuffer { public: CPDF_ScaledRenderBuffer(); @@ -283,7 +283,7 @@ private: CFX_AffineMatrix m_Matrix; }; class ICodec_ScanlineDecoder; -class CPDF_QuickStretcher : public CFX_Object +class CPDF_QuickStretcher { public: CPDF_QuickStretcher(); @@ -300,7 +300,7 @@ public: CPDF_StreamAcc m_StreamAcc; int m_LineIndex; }; -class CPDF_DeviceBuffer : public CFX_Object +class CPDF_DeviceBuffer { public: CPDF_DeviceBuffer(); @@ -324,7 +324,7 @@ private: CFX_DIBitmap* m_pBitmap; CFX_AffineMatrix m_Matrix; }; -class CPDF_ImageCache : public CFX_Object +class CPDF_ImageCache { public: CPDF_ImageCache(CPDF_Document* pDoc, CPDF_Stream* pStream); |