diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /core/src/fpdfapi/fpdf_page/pageint.h | |
parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'core/src/fpdfapi/fpdf_page/pageint.h')
-rw-r--r-- | core/src/fpdfapi/fpdf_page/pageint.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 1f5428d56f..9ff1c4cb11 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -23,7 +23,7 @@ public: typedef enum { EndOfData, Number, Keyword, Name, Others } SyntaxType; SyntaxType ParseNextElement(); - FX_LPBYTE GetWordBuf() + uint8_t* GetWordBuf() { return m_WordBuffer; } @@ -142,9 +142,9 @@ public: _ContentParam m_ParamBuf1[PARAM_BUF_SIZE]; FX_DWORD m_ParamStartPos; FX_DWORD m_ParamCount; - void AddNumberParam(FX_LPCSTR str, int len); + void AddNumberParam(const FX_CHAR* str, int len); void AddObjectParam(CPDF_Object* pObj); - void AddNameParam(FX_LPCSTR name, int size); + void AddNameParam(const FX_CHAR* name, int size); int GetNextParamPos(); void ClearAllParams(); CPDF_Object* GetObject(FX_DWORD index); @@ -155,7 +155,7 @@ public: { return (int32_t)(GetNumber(index)); } - FX_BOOL OnOperator(FX_LPCSTR op); + FX_BOOL OnOperator(const FX_CHAR* op); void BigCaseCaller(int index); FX_BOOL m_bAbort; CPDF_StreamParser* m_pSyntax; @@ -173,7 +173,7 @@ public: void ConvertUserSpace(FX_FLOAT& x, FX_FLOAT& y); void ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y); void OnChangeTextMatrix(); - FX_DWORD Parse(FX_LPCBYTE pData, FX_DWORD dwSize, FX_DWORD max_cost); + FX_DWORD Parse(const uint8_t* pData, FX_DWORD dwSize, FX_DWORD max_cost); void ParsePathObject(); int m_CompatCount; FX_PATHPOINT* m_pPathPoints; @@ -307,7 +307,7 @@ protected: CPDF_StreamAcc* m_pSingleStream; CPDF_StreamAcc** m_pStreamArray; FX_DWORD m_nStreams; - FX_LPBYTE m_pData; + uint8_t* m_pData; FX_DWORD m_Size; class CPDF_StreamContentParser* m_pParser; FX_DWORD m_CurrentOffset; @@ -420,11 +420,11 @@ protected: class CPDF_IccProfile { public: - CPDF_IccProfile(FX_LPCBYTE pData, FX_DWORD dwSize); + CPDF_IccProfile(const uint8_t* pData, FX_DWORD dwSize); ~CPDF_IccProfile(); int32_t GetComponents() const { return m_nSrcComponents; } FX_BOOL m_bsRGB; - FX_LPVOID m_pTransform; + void* m_pTransform; private: int32_t m_nSrcComponents; }; @@ -436,7 +436,7 @@ public: FX_BOOL SetRGB(FX_FLOAT* pBuf, FX_FLOAT R, FX_FLOAT G, FX_FLOAT B) const; FX_BOOL v_GetCMYK(FX_FLOAT* pBuf, FX_FLOAT& c, FX_FLOAT& m, FX_FLOAT& y, FX_FLOAT& k) const; FX_BOOL v_SetCMYK(FX_FLOAT* pBuf, FX_FLOAT c, FX_FLOAT m, FX_FLOAT y, FX_FLOAT k) const; - virtual void TranslateImageLine(FX_LPBYTE pDestBuf, FX_LPCBYTE pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask = FALSE) const; + virtual void TranslateImageLine(uint8_t* pDestBuf, const uint8_t* pSrcBuf, int pixels, int image_width, int image_height, FX_BOOL bTransMask = FALSE) const; }; class CPDF_PatternCS : public CPDF_ColorSpace { @@ -461,7 +461,7 @@ public: int m_nIndex; }; ~CPDF_ResourceNaming(); - CFX_ByteString GetName(const CPDF_Dictionary* pResList, FX_LPCSTR szType); + CFX_ByteString GetName(const CPDF_Dictionary* pResList, const FX_CHAR* szType); protected: CFX_MapByteStringToPtr m_NamingCache; }; |