From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 13:24:12 -0700 Subject: Merge to XFA: Use stdint.h types throughout PDFium. Near-automatic merge, plus re-running scripts to update additional usage. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1172793002 --- xfa/src/fdp/include/fde_brs.h | 18 ++++++------ xfa/src/fdp/include/fde_css.h | 64 +++++++++++++++++++++---------------------- xfa/src/fdp/include/fde_img.h | 30 ++++++++++---------- xfa/src/fdp/include/fde_mem.h | 4 +-- xfa/src/fdp/include/fde_pen.h | 20 +++++++------- xfa/src/fdp/include/fde_psr.h | 18 ++++++------ xfa/src/fdp/include/fde_rdr.h | 2 +- xfa/src/fdp/include/fde_rdv.h | 6 ++-- xfa/src/fdp/include/fde_tto.h | 28 +++++++++---------- xfa/src/fdp/include/fde_xml.h | 52 +++++++++++++++++------------------ 10 files changed, 121 insertions(+), 121 deletions(-) (limited to 'xfa/src/fdp/include') diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h index 04a4f48ad5..dacf31fd2a 100644 --- a/xfa/src/fdp/include/fde_brs.h +++ b/xfa/src/fdp/include/fde_brs.h @@ -33,9 +33,9 @@ typedef CFX_ArrayTemplate CFDE_GradientColors; class IFDE_Brush { public: - static IFDE_Brush* Create(FX_INT32 iType); + static IFDE_Brush* Create(int32_t iType); virtual void Release() = 0; - virtual FX_INT32 GetType() const = 0; + virtual int32_t GetType() const = 0; }; class IFDE_SolidBrush : public IFDE_Brush { @@ -112,16 +112,16 @@ class IFDE_HatchBrush : public IFDE_Brush public: virtual FX_ARGB GetColor(FX_BOOL bForegroundColor) const = 0; virtual void SetColor(FX_ARGB color, FX_BOOL bForegroundColor) = 0; - virtual FX_INT32 GetHatchStyle() const = 0; - virtual FX_BOOL SetHatchStyle(FX_INT32 iHatchStyle) = 0; + virtual int32_t GetHatchStyle() const = 0; + virtual FX_BOOL SetHatchStyle(int32_t iHatchStyle) = 0; }; class IFDE_TextureBrush : public IFDE_Brush { public: virtual IFDE_Image* GetImage() const = 0; virtual void SetImage(IFDE_Image *pImage, FX_BOOL bAutoRelease) = 0; - virtual FX_INT32 GetWrapMode() const = 0; - virtual void SetWrapMode(FX_INT32 iWrapMode) = 0; + virtual int32_t GetWrapMode() const = 0; + virtual void SetWrapMode(int32_t iWrapMode) = 0; }; #define FDE_LINEARGRADIENTMODE_Horizontal 0 #define FDE_LINEARGRADIENTMODE_Vertical 1 @@ -134,10 +134,10 @@ public: virtual void SetLinearPoints(const CFX_PointF &startingPoint, const CFX_PointF &endingPoint) = 0; virtual void GetLinearColors(FX_ARGB &startingColor, FX_ARGB &endingColor) const = 0; virtual void SetLinearColors(const FX_ARGB &startingColor, const FX_ARGB &endingColor) = 0; - virtual FX_INT32 CountGradientColors() const = 0; + virtual int32_t CountGradientColors() const = 0; virtual FX_BOOL GetGradientColors(CFDE_GradientColors &colors) const = 0; virtual FX_BOOL SetGradientColors(const CFDE_GradientColors &colors) = 0; - virtual FX_INT32 GetWrapMode() const = 0; - virtual void SetWrapMode(FX_INT32 iWrapMode) = 0; + virtual int32_t GetWrapMode() const = 0; + virtual void SetWrapMode(int32_t iWrapMode) = 0; }; #endif diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h index 2870c8d27a..0c9b323954 100644 --- a/xfa/src/fdp/include/fde_css.h +++ b/xfa/src/fdp/include/fde_css.h @@ -242,11 +242,11 @@ public: virtual FDE_CSSPRIMITIVETYPE GetPrimitiveType() const = 0; virtual FX_ARGB GetRGBColor() const = 0; virtual FX_FLOAT GetFloat() const = 0; - virtual FX_LPCWSTR GetString(FX_INT32 &iLength) const = 0; + virtual FX_LPCWSTR GetString(int32_t &iLength) const = 0; virtual FDE_CSSPROPERTYVALUE GetEnum() const = 0; virtual FX_LPCWSTR GetFuncName() const = 0; - virtual FX_INT32 CountArgs() const = 0; - virtual IFDE_CSSValue* GetArgs(FX_INT32 index) const = 0; + virtual int32_t CountArgs() const = 0; + virtual IFDE_CSSValue* GetArgs(int32_t index) const = 0; }; class IFDE_CSSValueList : public IFDE_CSSValue { @@ -255,8 +255,8 @@ public: { return FDE_CSSVALUETYPE_List; } - virtual FX_INT32 CountValues() const = 0; - virtual IFDE_CSSValue* GetValue(FX_INT32 index) const = 0; + virtual int32_t CountValues() const = 0; + virtual IFDE_CSSValue* GetValue(int32_t index) const = 0; }; enum FDE_CSSPROPERTY { FDE_CSSPROPERTY_WritingMode, @@ -429,8 +429,8 @@ public: { return FDE_CSSRULETYPE_Style; } - virtual FX_INT32 CountSelectorLists() const = 0; - virtual IFDE_CSSSelector* GetSelectorList(FX_INT32 index) const = 0; + virtual int32_t CountSelectorLists() const = 0; + virtual IFDE_CSSSelector* GetSelectorList(int32_t index) const = 0; virtual IFDE_CSSDeclaration* GetDeclaration() const = 0; }; class IFDE_CSSMediaRule : public IFDE_CSSRule @@ -441,8 +441,8 @@ public: return FDE_CSSRULETYPE_Media; } virtual FX_DWORD GetMediaList() const = 0; - virtual FX_INT32 CountRules() const = 0; - virtual IFDE_CSSRule* GetRule(FX_INT32 index) = 0; + virtual int32_t CountRules() const = 0; + virtual IFDE_CSSRule* GetRule(int32_t index) = 0; }; class IFDE_CSSFontFaceRule : public IFDE_CSSRule { @@ -458,13 +458,13 @@ class IFDE_CSSStyleSheet : public IFX_Unknown public: static IFDE_CSSStyleSheet* LoadHTMLStandardStyleSheet(); static IFDE_CSSStyleSheet* LoadFromStream(const CFX_WideString &szUrl, IFX_Stream *pStream, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); - static IFDE_CSSStyleSheet* LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, FX_INT32 iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); + static IFDE_CSSStyleSheet* LoadFromBuffer(const CFX_WideString &szUrl, FX_LPCWSTR pBuffer, int32_t iBufSize, FX_WORD wCodePage, FX_DWORD dwMediaList = FDE_CSSMEDIATYPE_ALL); virtual FX_BOOL GetUrl(CFX_WideString &szUrl) = 0; virtual FX_DWORD GetMediaList() const = 0; virtual FX_WORD GetCodePage() const = 0; - virtual FX_INT32 CountRules() const = 0; - virtual IFDE_CSSRule* GetRule(FX_INT32 index) = 0; + virtual int32_t CountRules() const = 0; + virtual IFDE_CSSRule* GetRule(int32_t index) = 0; }; typedef CFX_ArrayTemplate CFDE_CSSStyleSheetArray; #define FDE_CSSUSERSTYLESHEET (FX_BSTRC("#USERSHEET")) @@ -474,7 +474,7 @@ class IFDE_CSSStyleSheetCache public: static IFDE_CSSStyleSheetCache* Create(); virtual void Release() = 0; - virtual void SetMaxItems(FX_INT32 iMaxCount = 5) = 0; + virtual void SetMaxItems(int32_t iMaxCount = 5) = 0; virtual void AddStyleSheet(FX_BSTR szKey, IFDE_CSSStyleSheet *pStyleSheet) = 0; virtual IFDE_CSSStyleSheet* GetStyleSheet(FX_BSTR szKey) const = 0; virtual void RemoveStyleSheet(FX_BSTR szKey) = 0; @@ -503,11 +503,11 @@ class IFDE_CSSSyntaxParser public: static IFDE_CSSSyntaxParser* Create(); virtual void Release() = 0; - virtual FX_BOOL Init(IFX_Stream *pStream, FX_INT32 iCSSPlaneSize, FX_INT32 iTextDataSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; - virtual FX_BOOL Init(FX_LPCWSTR pBuffer, FX_INT32 iBufferSize, FX_INT32 iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; + virtual FX_BOOL Init(IFX_Stream *pStream, int32_t iCSSPlaneSize, int32_t iTextDataSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; + virtual FX_BOOL Init(FX_LPCWSTR pBuffer, int32_t iBufferSize, int32_t iTextDatSize = 32, FX_BOOL bOnlyDeclaration = FALSE) = 0; virtual FDE_CSSSYNTAXSTATUS DoSyntaxParse() = 0; - virtual FX_LPCWSTR GetCurrentString(FX_INT32 &iLength) const = 0; + virtual FX_LPCWSTR GetCurrentString(int32_t &iLength) const = 0; }; enum FDE_CSSLENGTHUNIT { FDE_CSSLENGTHUNIT_Auto, @@ -526,7 +526,7 @@ struct FDE_CSSLENGTH { } FDE_CSSLENGTH& Set(FDE_CSSLENGTHUNIT eUnit, FX_FLOAT fValue) { - m_iData = ((FX_INTPTR)(fValue * 1024.0f) << FDE_CSSUNITBITS) | eUnit; + m_iData = ((intptr_t)(fValue * 1024.0f) << FDE_CSSUNITBITS) | eUnit; return *this; } FDE_CSSLENGTHUNIT GetUnit() const @@ -542,7 +542,7 @@ struct FDE_CSSLENGTH { return (m_iData >> FDE_CSSUNITBITS) != 0; } private: - FX_INTPTR m_iData; + intptr_t m_iData; }; struct FDE_CSSPOINT { FDE_CSSPOINT& Set(FDE_CSSLENGTHUNIT eUnit) @@ -867,19 +867,19 @@ public: class IFDE_CSSGeneratedContentStyle { public: - virtual FX_INT32 CountCounters() = 0; - virtual FX_LPCWSTR GetCounterIdentifier(FX_INT32 index) = 0; - virtual FX_BOOL GetCounterReset(FX_INT32 index, FX_INT32 &iValue) = 0; - virtual FX_BOOL GetCounterIncrement(FX_INT32 index, FX_INT32 &iValue) = 0; + virtual int32_t CountCounters() = 0; + virtual FX_LPCWSTR GetCounterIdentifier(int32_t index) = 0; + virtual FX_BOOL GetCounterReset(int32_t index, int32_t &iValue) = 0; + virtual FX_BOOL GetCounterIncrement(int32_t index, int32_t &iValue) = 0; virtual IFDE_CSSValueList* GetContent() const = 0; - virtual FX_INT32 CountQuotes() const = 0; - virtual FX_LPCWSTR GetQuotes(FX_INT32 index) const = 0; + virtual int32_t CountQuotes() const = 0; + virtual FX_LPCWSTR GetQuotes(int32_t index) const = 0; }; class IFDE_CSSFontStyle { public: - virtual FX_INT32 CountFontFamilies() const = 0; - virtual FX_LPCWSTR GetFontFamily(FX_INT32 index) const = 0; + virtual int32_t CountFontFamilies() const = 0; + virtual FX_LPCWSTR GetFontFamily(int32_t index) const = 0; virtual FX_WORD GetFontWeight() const = 0; virtual FDE_CSSFONTVARIANT GetFontVariant() const = 0; virtual FDE_CSSFONTSTYLE GetFontStyle() const = 0; @@ -955,12 +955,12 @@ public: virtual const FDE_CSSLENGTH& GetWordSpacing() const = 0; virtual FDE_CSSWRITINGMODE GetWritingMode() const = 0; virtual FDE_CSSWORDBREAK GetWordBreak() const = 0; - virtual FX_INT32 GetWidows() const = 0; + virtual int32_t GetWidows() const = 0; virtual FX_ARGB GetTextEmphasisColor() const = 0; virtual FDE_CSSPAGEBREAK GetPageBreakBefore() const = 0; virtual FDE_CSSPAGEBREAK GetPageBreakAfter() const = 0; virtual FDE_CSSPAGEBREAK GetPageBreakInside() const = 0; - virtual FX_INT32 GetOrphans() const = 0; + virtual int32_t GetOrphans() const = 0; virtual FDE_CSSLINEBREAK GetLineBreak() const = 0; virtual FDE_CSSTEXTEMPHASISMARK GetTextEmphasisMark() const = 0; virtual FDE_CSSTEXTEMPHASISFILL GetTextEmphasisFill() const = 0; @@ -980,12 +980,12 @@ public: virtual void SetWordSpacing(const FDE_CSSLENGTH &wordSpacing) = 0; virtual void SetWritingMode(FDE_CSSWRITINGMODE eWritingMode) = 0; virtual void SetWordBreak(FDE_CSSWORDBREAK eWordBreak) = 0; - virtual void SetWidows(FX_INT32 iWidows) = 0; + virtual void SetWidows(int32_t iWidows) = 0; virtual void SetTextEmphasisColor(FX_ARGB dwTextEmphasisColor) = 0; virtual void SetPageBreakBefore(FDE_CSSPAGEBREAK ePageBreakBefore) = 0; virtual void SetPageBreakAfter(FDE_CSSPAGEBREAK ePageBreakAfter) = 0; virtual void SetPageBreakInside(FDE_CSSPAGEBREAK ePageBreakInside) = 0; - virtual void SetOrphans(FX_INT32 iOrphans) = 0; + virtual void SetOrphans(int32_t iOrphans) = 0; virtual void SetLineBreak(FDE_CSSLINEBREAK eLineBreak) = 0; }; class IFDE_CSSBackgroundStyle @@ -1076,7 +1076,7 @@ public: virtual void UpdateStyleIndex(FX_DWORD dwMediaList) = 0; virtual IFDE_CSSAccelerator* InitAccelerator() = 0; virtual IFDE_CSSComputedStyle* CreateComputedStyle(IFDE_CSSComputedStyle *pParentStyle) = 0; - virtual FX_INT32 MatchDeclarations(IFDE_CSSTagProvider *pTag, CFDE_CSSDeclarationArray &matchedDecls, FDE_CSSPERSUDO ePersudoType = FDE_CSSPERSUDO_NONE) = 0; - virtual void ComputeStyle(IFDE_CSSTagProvider *pTag, const IFDE_CSSDeclaration **ppDeclArray, FX_INT32 iDeclCount, IFDE_CSSComputedStyle *pDestStyle) = 0; + virtual int32_t MatchDeclarations(IFDE_CSSTagProvider *pTag, CFDE_CSSDeclarationArray &matchedDecls, FDE_CSSPERSUDO ePersudoType = FDE_CSSPERSUDO_NONE) = 0; + virtual void ComputeStyle(IFDE_CSSTagProvider *pTag, const IFDE_CSSDeclaration **ppDeclArray, int32_t iDeclCount, IFDE_CSSComputedStyle *pDestStyle) = 0; }; #endif diff --git a/xfa/src/fdp/include/fde_img.h b/xfa/src/fdp/include/fde_img.h index 808bc4c304..92ed9daac6 100644 --- a/xfa/src/fdp/include/fde_img.h +++ b/xfa/src/fdp/include/fde_img.h @@ -18,21 +18,21 @@ class IFDE_Image; class IFDE_Image { public: - static IFDE_Image* Create(IFX_Stream *pStream, FX_INT32 iFormat = FDE_IMAGEFORMAT_Unknown); + static IFDE_Image* Create(IFX_Stream *pStream, int32_t iFormat = FDE_IMAGEFORMAT_Unknown); virtual void Release() = 0; virtual FX_BOOL LoadImage() = 0; virtual void FreeImage() = 0; - virtual FX_INT32 CountFrames() const = 0; - virtual FX_BOOL LoadFrame(FX_INT32 index) = 0; + virtual int32_t CountFrames() const = 0; + virtual FX_BOOL LoadFrame(int32_t index) = 0; virtual CFX_DIBitmap* GetFrameImage() = 0; - virtual FX_INT32 GetImageFormat() const = 0; - virtual FX_INT32 GetImageWidth() const = 0; - virtual FX_INT32 GetImageHeight() const = 0; - virtual FX_INT32 GetDelayTime(FX_INT32 iFrameIndex) const = 0; - virtual FX_INT32 GetLoopCount() const = 0; - virtual FX_BOOL StartLoadImage(CFX_DIBitmap *pDIBitmap, FX_INT32 dibX, FX_INT32 dibY, FX_INT32 dibCX, FX_INT32 dibCY, - FX_INT32 imgX, FX_INT32 imgY, FX_INT32 imgCX, FX_INT32 imgCY, FX_INT32 iFrameIndex = 0) = 0; - virtual FX_INT32 DoLoadImage(IFX_Pause *pPause = NULL) = 0; + virtual int32_t GetImageFormat() const = 0; + virtual int32_t GetImageWidth() const = 0; + virtual int32_t GetImageHeight() const = 0; + virtual int32_t GetDelayTime(int32_t iFrameIndex) const = 0; + virtual int32_t GetLoopCount() const = 0; + virtual FX_BOOL StartLoadImage(CFX_DIBitmap *pDIBitmap, int32_t dibX, int32_t dibY, int32_t dibCX, int32_t dibCY, + int32_t imgX, int32_t imgY, int32_t imgCX, int32_t imgCY, int32_t iFrameIndex = 0) = 0; + virtual int32_t DoLoadImage(IFX_Pause *pPause = NULL) = 0; virtual void StopLoadImage() = 0; }; #define FDE_IMAGEFILTER_Unknown -1 @@ -45,11 +45,11 @@ public: #define FDE_IMAGEFILTER_Brightness 6 #define FDE_IMAGEFILTER_Contrast 7 typedef struct _FDE_IMAGEFILTERPARAMS : public CFX_Target { - FX_INT32 iFilterType; + int32_t iFilterType; } FDE_IMAGEFILTERPARAMS, * FDE_LPIMAGEFILTERPARAMS; typedef FDE_IMAGEFILTERPARAMS const * FDE_LPCIMAGEFILTERPARAMS; typedef struct _FDE_OPACITYPARAMS : public FDE_IMAGEFILTERPARAMS { - FX_INT32 iOpacity; + int32_t iOpacity; } FDE_OPACITYPARAMS, * FDE_LPOPACITYPARAMS; typedef FDE_OPACITYPARAMS const * FDE_LPCOPACITYPARAMS; typedef struct _FDE_BLACKWHITEPARAMS : public FDE_IMAGEFILTERPARAMS { @@ -66,11 +66,11 @@ typedef struct _FDE_MASKCOLORPARAMS : public FDE_IMAGEFILTERPARAMS { } FDE_MASKCOLORPARAMS, * FDE_LPMASKCOLORPARAMS; typedef FDE_MASKCOLORPARAMS const * FDE_LPCMASKCOLORPARAMS; typedef struct _FDE_BRIGHTNESSPARAMS : public FDE_IMAGEFILTERPARAMS { - FX_INT32 iBrightness; + int32_t iBrightness; } FDE_BRIGHTNESSPARAMS, * FDE_LPBRIGHTNESSPARAMS; typedef FDE_BRIGHTNESSPARAMS const * FDE_LPCBRIGHTNESSPARAMS; typedef struct _FDE_CONTRASTPARAMS : public FDE_IMAGEFILTERPARAMS { - FX_INT32 iContrast; + int32_t iContrast; } FDE_CONTRASTPARAMS, * FDE_LPCONTRASTPARAMS; typedef FDE_CONTRASTPARAMS const * FDE_LPCCONTRASTPARAMS; #endif diff --git a/xfa/src/fdp/include/fde_mem.h b/xfa/src/fdp/include/fde_mem.h index 516e67c945..a7eb40a9e2 100644 --- a/xfa/src/fdp/include/fde_mem.h +++ b/xfa/src/fdp/include/fde_mem.h @@ -9,8 +9,8 @@ #ifdef __cplusplus extern "C" { #endif -#define FDE_Alloc(size) FX_Alloc(FX_BYTE, size) -#define FDE_Realloc(ptr, newSize) FX_Realloc(FX_BYTE, ptr, newSize) +#define FDE_Alloc(size) FX_Alloc(uint8_t, size) +#define FDE_Realloc(ptr, newSize) FX_Realloc(uint8_t, ptr, newSize) #define FDE_Free(ptr) FX_Free(ptr) #define FDE_New FXTARGET_New #define FDE_Delete FXTARGET_Delete diff --git a/xfa/src/fdp/include/fde_pen.h b/xfa/src/fdp/include/fde_pen.h index 7730b6a964..074dc3c3e7 100644 --- a/xfa/src/fdp/include/fde_pen.h +++ b/xfa/src/fdp/include/fde_pen.h @@ -36,25 +36,25 @@ class IFDE_Pen public: static IFDE_Pen* Create(); virtual void Release() = 0; - virtual FX_INT32 GetType() const = 0; + virtual int32_t GetType() const = 0; virtual FX_ARGB GetColor() const = 0; virtual void SetColor(FX_ARGB color) = 0; virtual IFDE_Brush* GetBrush() const = 0; virtual void SetBrush(IFDE_Brush *pBrush, FX_BOOL bAutoRelease) = 0; - virtual FX_INT32 GetLineCap() const = 0; - virtual void SetLineCap(FX_INT32 iLineCap) = 0; - virtual FX_INT32 GetDashStyle() const = 0; - virtual void SetDashStyle(FX_INT32 iDashStyle) = 0; + virtual int32_t GetLineCap() const = 0; + virtual void SetLineCap(int32_t iLineCap) = 0; + virtual int32_t GetDashStyle() const = 0; + virtual void SetDashStyle(int32_t iDashStyle) = 0; virtual FX_FLOAT GetDashPhase() const = 0; virtual void SetDashPhase(FX_FLOAT fPhase) = 0; - virtual FX_INT32 CountDashArray() const = 0; - virtual FX_INT32 GetDashArray(CFX_FloatArray &dashArray) const = 0; + virtual int32_t CountDashArray() const = 0; + virtual int32_t GetDashArray(CFX_FloatArray &dashArray) const = 0; virtual void SetDashArray(const CFX_FloatArray &dashArray) = 0; - virtual FX_INT32 GetLineJoin() const = 0; - virtual void SetLineJoin(FX_INT32 iLineJoin) = 0; + virtual int32_t GetLineJoin() const = 0; + virtual void SetLineJoin(int32_t iLineJoin) = 0; virtual FX_FLOAT GetMiterLimit() const = 0; virtual void SetMiterLimit(FX_FLOAT fMiterLimit) = 0; - virtual FX_INT32 CountCompoundPatterns() const = 0; + virtual int32_t CountCompoundPatterns() const = 0; virtual FX_BOOL GetCompoundPatterns(CFDE_CompoundPatterns &compoundPatterns) const = 0; virtual FX_BOOL SetCompoundPatterns(const CFDE_CompoundPatterns &compoundPatterns) = 0; }; diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 64070e6648..974f4cc879 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -35,12 +35,12 @@ public: class IFDE_TextSet : public IFDE_VisualSet { public: - virtual FX_INT32 GetString(FDE_HVISUALOBJ hText, CFX_WideString &wsText) = 0; + virtual int32_t GetString(FDE_HVISUALOBJ hText, CFX_WideString &wsText) = 0; virtual IFX_Font* GetFont(FDE_HVISUALOBJ hText) = 0; virtual FX_FLOAT GetFontSize(FDE_HVISUALOBJ hText) = 0; virtual FX_ARGB GetFontColor(FDE_HVISUALOBJ hText) = 0; - virtual FX_INT32 GetDisplayPos(FDE_HVISUALOBJ hText, FXTEXT_CHARPOS *pCharPos, FX_BOOL bCharCode = FALSE, CFX_WideString *pWSForms = NULL) = 0; - virtual FX_INT32 GetCharRects(FDE_HVISUALOBJ hText, CFX_RectFArray &rtArray) = 0; + virtual int32_t GetDisplayPos(FDE_HVISUALOBJ hText, FXTEXT_CHARPOS *pCharPos, FX_BOOL bCharCode = FALSE, CFX_WideString *pWSForms = NULL) = 0; + virtual int32_t GetCharRects(FDE_HVISUALOBJ hText, CFX_RectFArray &rtArray) = 0; }; class IFDE_ImageSet : public IFDE_VisualSet { @@ -58,8 +58,8 @@ class IFDE_PathSet : public IFDE_VisualSet { public: virtual IFDE_Path* GetPath(FDE_HVISUALOBJ hPath) = 0; - virtual FX_INT32 GetFillMode(FDE_HVISUALOBJ hPath) = 0; - virtual FX_INT32 GetRenderMode(FDE_HVISUALOBJ hPath) = 0; + virtual int32_t GetFillMode(FDE_HVISUALOBJ hPath) = 0; + virtual int32_t GetRenderMode(FDE_HVISUALOBJ hPath) = 0; virtual IFDE_Pen* GetPen(FDE_HVISUALOBJ hPath) = 0; virtual FX_FLOAT GetPenWidth(FDE_HVISUALOBJ hPath) = 0; virtual IFDE_Brush* GetBrush(FDE_HVISUALOBJ hPath) = 0; @@ -76,10 +76,10 @@ class IFDE_WidgetSet : public IFDE_VisualSet { public: virtual FDE_WIDGETOBJ GetWidgetType(FDE_HVISUALOBJ hWidget) = 0; - virtual FX_FLOAT GetFloat(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, FX_FLOAT fDefVal = 0.0f) = 0; - virtual FX_INT32 GetInteger(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, FX_INT32 iDefVal = 0) = 0; - virtual FX_BOOL GetString(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, CFX_WideString &wsValue) = 0; - virtual FX_BOOL GetRects(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, CFX_RectFArray &rects) = 0; + virtual FX_FLOAT GetFloat(FDE_HVISUALOBJ hWidget, int32_t iParameter, FX_FLOAT fDefVal = 0.0f) = 0; + virtual int32_t GetInteger(FDE_HVISUALOBJ hWidget, int32_t iParameter, int32_t iDefVal = 0) = 0; + virtual FX_BOOL GetString(FDE_HVISUALOBJ hWidget, int32_t iParameter, CFX_WideString &wsValue) = 0; + virtual FX_BOOL GetRects(FDE_HVISUALOBJ hWidget, int32_t iParameter, CFX_RectFArray &rects) = 0; }; class IFDE_VisualSetIterator { diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h index 74c5d24516..cbae1c26fa 100644 --- a/xfa/src/fdp/include/fde_rdr.h +++ b/xfa/src/fdp/include/fde_rdr.h @@ -9,7 +9,7 @@ class IFDE_Page; class IFDE_RenderDevice; class IFDE_RenderContext; -void FDE_GetPageMatrix(CFX_Matrix &pageMatrix, const CFX_RectF &docPageRect, const CFX_Rect &devicePageRect, FX_INT32 iRotate, FX_DWORD dwCoordinatesType = 0); +void FDE_GetPageMatrix(CFX_Matrix &pageMatrix, const CFX_RectF &docPageRect, const CFX_Rect &devicePageRect, int32_t iRotate, FX_DWORD dwCoordinatesType = 0); enum FDE_RENDERSTATUS { FDE_RENDERSTATUS_Reset = 0, FDE_RENDERSTATUS_Paused , diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h index ee1e922c48..eb79a81c9b 100644 --- a/xfa/src/fdp/include/fde_rdv.h +++ b/xfa/src/fdp/include/fde_rdv.h @@ -22,8 +22,8 @@ public: static IFDE_RenderDevice* Create(CFX_RenderDevice *pDevice); virtual void Release() = 0; - virtual FX_INT32 GetWidth() const = 0; - virtual FX_INT32 GetHeight() const = 0; + virtual int32_t GetWidth() const = 0; + virtual int32_t GetHeight() const = 0; virtual FDE_HDEVICESTATE SaveState() = 0; virtual void RestoreState(FDE_HDEVICESTATE hState) = 0; virtual FX_BOOL SetClipPath(const IFDE_Path *pClip) = 0; @@ -35,7 +35,7 @@ public: virtual FX_FLOAT GetDpiY() const = 0; virtual FX_BOOL DrawImage(CFX_DIBSource *pDib, const CFX_RectF *pSrcRect, const CFX_RectF &dstRect, const CFX_Matrix *pImgMatrix = NULL, const CFX_Matrix *pDevMatrix = NULL) = 0; - virtual FX_BOOL DrawString(IFDE_Brush *pBrush, IFX_Font *pFont, const FXTEXT_CHARPOS *pCharPos, FX_INT32 iCount, FX_FLOAT fFontSize, const CFX_Matrix *pMatrix = NULL) = 0; + virtual FX_BOOL DrawString(IFDE_Brush *pBrush, IFX_Font *pFont, const FXTEXT_CHARPOS *pCharPos, int32_t iCount, FX_FLOAT fFontSize, const CFX_Matrix *pMatrix = NULL) = 0; virtual FX_BOOL DrawBezier(IFDE_Pen *pPen, FX_FLOAT fPenWidth, const CFX_PointF &pt1, const CFX_PointF &pt2, const CFX_PointF &pt3, const CFX_PointF &pt4, const CFX_Matrix *pMatrix = NULL) = 0; virtual FX_BOOL DrawCurve(IFDE_Pen *pPen, FX_FLOAT fPenWidth, const CFX_PointsF &points, FX_BOOL bClosed, FX_FLOAT fTension = 0.5f, const CFX_Matrix *pMatrix = NULL) = 0; virtual FX_BOOL DrawEllipse(IFDE_Pen *pPen, FX_FLOAT fPenWidth, const CFX_RectF &rect, const CFX_Matrix *pMatrix = NULL) = 0; diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index 25dead13ca..8b4d1d4787 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -43,7 +43,7 @@ public: virtual void SetTabWidth(FX_FLOAT fTabWidth) = 0; virtual void SetEllipsisString(const CFX_WideString &wsEllipsis) = 0; virtual void SetParagraphBreakChar(FX_WCHAR wch) = 0; - virtual void SetAlignment(FX_INT32 iAlignment) = 0; + virtual void SetAlignment(int32_t iAlignment) = 0; virtual void SetLineSpace(FX_FLOAT fLineSpace) = 0; virtual void SetDIBitmap(CFX_DIBitmap *pDIB) = 0; virtual void SetRenderDevice(CFX_RenderDevice *pDevice) = 0; @@ -51,19 +51,19 @@ public: virtual void SetClipRect(const CFX_RectF &rtClip) = 0; virtual void SetMatrix(const CFX_Matrix &matrix) = 0; virtual void SetLineBreakTolerance(FX_FLOAT fTolerance) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_Size &size) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_SizeF &size) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_Rect &rect) = 0; - virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_INT32 x, FX_INT32 y) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_FLOAT x, FX_FLOAT y) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_Rect &rect) = 0; - virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect) = 0; + virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size) = 0; + virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0; + virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect) = 0; + virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0; + virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y) = 0; + virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0; + virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect) = 0; + virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0; virtual void SetLogicClipRect(const CFX_RectF &rtClip) = 0; - virtual void CalcLogicSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_SizeF &size) = 0; - virtual void CalcLogicSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect) = 0; - virtual void DrawLogicText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_FLOAT x, FX_FLOAT y) = 0; - virtual void DrawLogicText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect) = 0; - virtual FX_INT32 GetTotalLines() = 0; + virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0; + virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0; + virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0; + virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0; + virtual int32_t GetTotalLines() = 0; }; #endif diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h index b8b136b5aa..eddb9a1835 100644 --- a/xfa/src/fdp/include/fde_xml.h +++ b/xfa/src/fdp/include/fde_xml.h @@ -32,7 +32,7 @@ enum FDE_XMLNODETYPE { FDE_XMLNODE_CharData , }; typedef struct _FDE_XMLNODE { - FX_INT32 iNodeNum; + int32_t iNodeNum; FDE_XMLNODETYPE eNodeType; } FDE_XMLNODE, * FDE_LPXMLNODE; typedef FDE_XMLNODE const * FDE_LPCXMLNODE; @@ -48,16 +48,16 @@ class IFDE_XMLNode public: virtual void Release() = 0; virtual FDE_XMLNODETYPE GetType() const = 0; - virtual FX_INT32 CountChildNodes() const = 0; - virtual IFDE_XMLNode* GetChildNode(FX_INT32 index) const = 0; - virtual FX_INT32 GetChildNodeIndex(IFDE_XMLNode *pNode) const = 0; - virtual IFDE_XMLNode* GetPath(FX_LPCWSTR pPath, FX_INT32 iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0; - virtual FX_INT32 InsertChildNode(IFDE_XMLNode *pNode, FX_INT32 index = -1) = 0; + virtual int32_t CountChildNodes() const = 0; + virtual IFDE_XMLNode* GetChildNode(int32_t index) const = 0; + virtual int32_t GetChildNodeIndex(IFDE_XMLNode *pNode) const = 0; + virtual IFDE_XMLNode* GetPath(FX_LPCWSTR pPath, int32_t iLength = -1, FX_BOOL bQualifiedName = TRUE) const = 0; + virtual int32_t InsertChildNode(IFDE_XMLNode *pNode, int32_t index = -1) = 0; virtual void RemoveChildNode(IFDE_XMLNode *pNode) = 0; virtual void DeleteChildren() = 0; enum NodeItem {Root = 0, Parent, FirstSibling, PriorSibling, NextSibling, LastSibling, FirstNeighbor, PriorNeighbor, NextNeighbor, LastNeighbor, FirstChild, LastChild}; virtual IFDE_XMLNode* GetNodeItem(NodeItem eItem) const = 0; - virtual FX_INT32 GetNodeLevel() const = 0; + virtual int32_t GetNodeLevel() const = 0; virtual FX_BOOL InsertNodeItem(IFDE_XMLNode::NodeItem eItem, IFDE_XMLNode *pNode) = 0; virtual IFDE_XMLNode* RemoveNodeItem(IFDE_XMLNode::NodeItem eItem) = 0; virtual IFDE_XMLNode* Clone(FX_BOOL bRecursive) = 0; @@ -68,20 +68,20 @@ class IFDE_XMLInstruction : public IFDE_XMLNode public: static IFDE_XMLInstruction* Create(const CFX_WideString &wsTarget); virtual void GetTargetName(CFX_WideString &wsTarget) const = 0; - virtual FX_INT32 CountAttributes() const = 0; - virtual FX_BOOL GetAttribute(FX_INT32 index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; + virtual int32_t CountAttributes() const = 0; + virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const = 0; virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0; - virtual FX_INT32 GetInteger(FX_LPCWSTR pwsAttriName, FX_INT32 iDefValue = 0) const = 0; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, FX_INT32 iAttriValue) = 0; + virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0; + virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0; virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0; virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0; - virtual FX_INT32 CountData() const = 0; - virtual FX_BOOL GetData(FX_INT32 index, CFX_WideString &wsData) const = 0; + virtual int32_t CountData() const = 0; + virtual FX_BOOL GetData(int32_t index, CFX_WideString &wsData) const = 0; virtual void AppendData(const CFX_WideString &wsData) = 0; - virtual void RemoveData(FX_INT32 index) = 0; + virtual void RemoveData(int32_t index) = 0; }; class IFDE_XMLElement : public IFDE_XMLNode { @@ -91,13 +91,13 @@ public: virtual void GetLocalTagName(CFX_WideString &wsTag) const = 0; virtual void GetNamespacePrefix(CFX_WideString &wsPrefix) const = 0; virtual void GetNamespaceURI(CFX_WideString &wsNamespace) const = 0; - virtual FX_INT32 CountAttributes() const = 0; - virtual FX_BOOL GetAttribute(FX_INT32 index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; + virtual int32_t CountAttributes() const = 0; + virtual FX_BOOL GetAttribute(int32_t index, CFX_WideString &wsAttriName, CFX_WideString &wsAttriValue) const = 0; virtual FX_BOOL HasAttribute(FX_LPCWSTR pwsAttriName) const = 0; virtual void GetString(FX_LPCWSTR pwsAttriName, CFX_WideString &wsAttriValue, FX_LPCWSTR pwsDefValue = NULL) const = 0; virtual void SetString(const CFX_WideString &wsAttriName, const CFX_WideString &wsAttriValue) = 0; - virtual FX_INT32 GetInteger(FX_LPCWSTR pwsAttriName, FX_INT32 iDefValue = 0) const = 0; - virtual void SetInteger(FX_LPCWSTR pwsAttriName, FX_INT32 iAttriValue) = 0; + virtual int32_t GetInteger(FX_LPCWSTR pwsAttriName, int32_t iDefValue = 0) const = 0; + virtual void SetInteger(FX_LPCWSTR pwsAttriName, int32_t iAttriValue) = 0; virtual FX_FLOAT GetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fDefValue = 0) const = 0; virtual void SetFloat(FX_LPCWSTR pwsAttriName, FX_FLOAT fAttriValue) = 0; virtual void RemoveAttribute(FX_LPCWSTR pwsAttriName) = 0; @@ -137,9 +137,9 @@ class IFDE_XMLDoc public: static IFDE_XMLDoc* Create(); virtual void Release() = 0; - virtual FX_BOOL LoadXML(IFX_Stream *pXMLStream, FX_INT32 iXMLPlaneSize = 8192, FX_INT32 iTextDataSize = 256, FDE_LPXMLREADERHANDLER pHandler = NULL) = 0; + virtual FX_BOOL LoadXML(IFX_Stream *pXMLStream, int32_t iXMLPlaneSize = 8192, int32_t iTextDataSize = 256, FDE_LPXMLREADERHANDLER pHandler = NULL) = 0; virtual FX_BOOL LoadXML(IFDE_XMLParser *pXMLParser) = 0; - virtual FX_INT32 DoLoad(IFX_Pause *pPause = NULL) = 0; + virtual int32_t DoLoad(IFX_Pause *pPause = NULL) = 0; virtual void CloseXML() = 0; virtual IFDE_XMLNode* GetRoot() const = 0; virtual void SaveXML(IFX_Stream *pXMLStream = NULL, FX_BOOL bSaveBOM = TRUE) = 0; @@ -149,7 +149,7 @@ class IFDE_XMLParser { public: virtual void Release() = 0; - virtual FX_INT32 DoParser(IFX_Pause *pPause) = 0; + virtual int32_t DoParser(IFX_Pause *pPause) = 0; }; #define FDE_XMLSYNTAXSTATUS_None 0x00 #define FDE_XMLSYNTAXSTATUS_InstructionOpen 0x01 @@ -171,13 +171,13 @@ class IFDE_XMLSyntaxParser public: static IFDE_XMLSyntaxParser* Create(); virtual void Release() = 0; - virtual void Init(IFX_Stream *pStream, FX_INT32 iXMLPlaneSize, FX_INT32 iTextDataSize = 256) = 0; + virtual void Init(IFX_Stream *pStream, int32_t iXMLPlaneSize, int32_t iTextDataSize = 256) = 0; virtual FX_DWORD DoSyntaxParse() = 0; - virtual FX_INT32 GetStatus() const = 0; - virtual FX_INT32 GetCurrentPos() const = 0; + virtual int32_t GetStatus() const = 0; + virtual int32_t GetCurrentPos() const = 0; virtual FX_FILESIZE GetCurrentBinaryPos() const = 0; - virtual FX_INT32 GetCurrentNodeNumber() const = 0; - virtual FX_INT32 GetLastNodeNumber() const = 0; + virtual int32_t GetCurrentNodeNumber() const = 0; + virtual int32_t GetLastNodeNumber() const = 0; virtual void GetTargetName(CFX_WideString &wsTarget) const = 0; virtual void GetTagName(CFX_WideString &wsTag) const = 0; virtual void GetAttributeName(CFX_WideString &wsAttriName) const = 0; -- cgit v1.2.3