diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/include/fwl/lightwidget/picturebox.h | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz | |
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
Diffstat (limited to 'xfa/include/fwl/lightwidget/picturebox.h')
| -rw-r--r-- | xfa/include/fwl/lightwidget/picturebox.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h index dd87d6806b..d15c2510a0 100644 --- a/xfa/include/fwl/lightwidget/picturebox.h +++ b/xfa/include/fwl/lightwidget/picturebox.h @@ -20,10 +20,10 @@ public: FWL_ERR SetPicture(CFX_DIBitmap *pBitmap);
FX_FLOAT GetRotation();
FWL_ERR SetRotation(FX_FLOAT fRotation);
- FX_INT32 GetFlipMode();
- FWL_ERR SetFlipMode(FX_INT32 iFlipMode);
- FX_INT32 GetOpacity();
- FWL_ERR SetOpacity(FX_INT32 iOpacity);
+ int32_t GetFlipMode();
+ FWL_ERR SetFlipMode(int32_t iFlipMode);
+ int32_t GetOpacity();
+ FWL_ERR SetOpacity(int32_t iOpacity);
FWL_ERR GetScale(FX_FLOAT &fScaleX, FX_FLOAT &fScaleY);
FWL_ERR SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY);
FWL_ERR GetOffset(FX_FLOAT &fx, FX_FLOAT &fy);
@@ -47,12 +47,12 @@ protected: virtual CFX_DIBitmap* GetPicture(IFWL_Widget *pWidget);
virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget *pWidget);
virtual CFX_DIBitmap* GetInitialPicture(IFWL_Widget *pWidget);
- virtual FX_INT32 GetOpacity(IFWL_Widget *pWidget);
- virtual FX_INT32 GetFlipMode(IFWL_Widget *pWidget);
+ virtual int32_t GetOpacity(IFWL_Widget *pWidget);
+ virtual int32_t GetFlipMode(IFWL_Widget *pWidget);
virtual FWL_ERR GetMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix);
CFX_DIBitmap *m_pBitmap;
- FX_INT32 m_iOpacity;
- FX_INT32 m_iFlipMode;
+ int32_t m_iOpacity;
+ int32_t m_iFlipMode;
FX_FLOAT m_fRotation;
FX_FLOAT m_fScaleX;
FX_FLOAT m_fScaleY;
|