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/include/fwl/basewidget/fwl_barcode.h | 14 ++++++------ xfa/include/fwl/basewidget/fwl_checkbox.h | 8 +++---- xfa/include/fwl/basewidget/fwl_combobox.h | 24 ++++++++++---------- xfa/include/fwl/basewidget/fwl_datetimepicker.h | 22 +++++++++--------- xfa/include/fwl/basewidget/fwl_edit.h | 30 ++++++++++++------------- xfa/include/fwl/basewidget/fwl_listbox.h | 20 ++++++++--------- xfa/include/fwl/basewidget/fwl_monthcalendar.h | 24 ++++++++++---------- xfa/include/fwl/basewidget/fwl_picturebox.h | 4 ++-- xfa/include/fwl/basewidget/fwl_tooltipctrl.h | 4 ++-- xfa/include/fwl/basewidget/fxmath_barcode.h | 30 ++++++++++++------------- 10 files changed, 90 insertions(+), 90 deletions(-) (limited to 'xfa/include/fwl/basewidget') diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index ba6e99691e..08f28b7b7d 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -34,17 +34,17 @@ class IFWL_BarcodeDP : public IFWL_EditDP { public: virtual BC_CHAR_ENCODING GetCharEncoding() = 0; - virtual FX_INT32 GetModuleHeight() = 0; - virtual FX_INT32 GetModuleWidth() = 0; - virtual FX_INT32 GetDataLength() = 0; - virtual FX_INT32 GetCalChecksum() = 0; + virtual int32_t GetModuleHeight() = 0; + virtual int32_t GetModuleWidth() = 0; + virtual int32_t GetDataLength() = 0; + virtual int32_t GetCalChecksum() = 0; virtual FX_BOOL GetPrintChecksum() = 0; virtual BC_TEXT_LOC GetTextLocation() = 0; - virtual FX_INT32 GetWideNarrowRatio() = 0; + virtual int32_t GetWideNarrowRatio() = 0; virtual FX_CHAR GetStartChar() = 0; virtual FX_CHAR GetEndChar() = 0; - virtual FX_INT32 GetVersion() = 0; - virtual FX_INT32 GetErrorCorrectionLevel() = 0; + virtual int32_t GetVersion() = 0; + virtual int32_t GetErrorCorrectionLevel() = 0; virtual FX_BOOL GetTruncated() = 0; virtual FX_DWORD GetBarcodeAttributeMask() = 0; }; diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 625ad489c2..0576dedcf3 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -74,8 +74,8 @@ public: static IFWL_CheckBox* Create(); FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); - FX_INT32 GetCheckState(); - FWL_ERR SetCheckState(FX_INT32 iCheck); + int32_t GetCheckState(); + FWL_ERR SetCheckState(int32_t iCheck); protected: IFWL_CheckBox(); virtual ~IFWL_CheckBox(); @@ -86,8 +86,8 @@ public: static IFWL_RadioButton* Create(); FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); - FX_INT32 GetCheckState(); - FWL_ERR SetCheckState(FX_INT32 iCheck); + int32_t GetCheckState(); + FWL_ERR SetCheckState(int32_t iCheck); protected: IFWL_RadioButton(); virtual ~IFWL_RadioButton(); diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index 74d6bdf24b..950189bbba 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -74,7 +74,7 @@ END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, FWL_EVTHASH_CMB_CloseUp) END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbEditChanged, FWL_EVTHASH_CMB_EditChanged) -FX_INT32 nChangeType; +int32_t nChangeType; CFX_WideString wsInsert; CFX_WideString wsDelete; END_FWL_EVENT_DEF @@ -83,12 +83,12 @@ CFX_Int32Array iArraySels; FX_BOOL bLButtonUp; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged, FWL_EVTHASH_CMB_HoverChanged) -FX_INT32 m_iCurHover; +int32_t m_iCurHover; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbDrawItem, FWL_EVTHASH_CMB_DrawItem) CFX_Graphics *m_pGraphics; CFX_Matrix m_matrix; -FX_INT32 m_index; +int32_t m_index; CFX_RectF m_rtItem; END_FWL_EVENT_DEF class IFWL_ComboBoxDP : public IFWL_ListBoxDP @@ -102,16 +102,16 @@ public: static IFWL_ComboBox* Create(); FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); - FX_INT32 GetCurSel(); - FWL_ERR SetCurSel(FX_INT32 iSel); + int32_t GetCurSel(); + FWL_ERR SetCurSel(int32_t iSel); FWL_ERR SetEditText(const CFX_WideString &wsText); - FX_INT32 GetEditTextLength() const; - FWL_ERR GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const; - FWL_ERR SetEditSelRange(FX_INT32 nStart, FX_INT32 nCount = -1); - FX_INT32 GetEditSelRange(FX_INT32 nIndex, FX_INT32 &nStart); - FX_INT32 GetEditLimit(); - FWL_ERR SetEditLimit(FX_INT32 nLimit); - FWL_ERR EditDoClipboard(FX_INT32 iCmd); + int32_t GetEditTextLength() const; + FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const; + FWL_ERR SetEditSelRange(int32_t nStart, int32_t nCount = -1); + int32_t GetEditSelRange(int32_t nIndex, int32_t &nStart); + int32_t GetEditLimit(); + FWL_ERR SetEditLimit(int32_t nLimit); + FWL_ERR EditDoClipboard(int32_t iCmd); FX_BOOL EditRedo(FX_BSTR bsRecord); FX_BOOL EditUndo(FX_BSTR bsRecord); IFWL_ListBox* GetListBoxt(); diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 898264eeec..3f2a60d792 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -54,17 +54,17 @@ BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpEditChanged, FWL_EVTHASH_DTP_EditChanged) CFX_WideString m_wsText; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpHoverChanged, FWL_EVTHASH_DTP_HoverChanged) -FX_INT32 hoverday; +int32_t hoverday; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpSelectChanged, FWL_EVTHASH_DTP_SelectChanged) -FX_INT32 iYear; -FX_INT32 iMonth; -FX_INT32 iDay; +int32_t iYear; +int32_t iMonth; +int32_t iDay; END_FWL_EVENT_DEF class IFWL_DateTimePickerDP : public IFWL_DataProvider { public: - virtual FWL_ERR GetToday(IFWL_Widget *pWidget, FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay) = 0; + virtual FWL_ERR GetToday(IFWL_Widget *pWidget, int32_t &iYear, int32_t &iMonth, int32_t &iDay) = 0; }; class IFWL_DateTimePicker : public IFWL_Widget { @@ -72,12 +72,12 @@ public: static IFWL_DateTimePicker* Create(); FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); - FWL_ERR GetCurSel(FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay); - FWL_ERR SetCurSel(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay); + FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay); + FWL_ERR SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay); FWL_ERR SetEditText(const CFX_WideString &wsText); - FWL_ERR GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const; - FX_INT32 CountSelRanges(); - FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart); + FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const; + int32_t CountSelRanges(); + int32_t GetSelRange(int32_t nIndex, int32_t &nStart); FX_BOOL CanUndo(); FX_BOOL CanRedo(); FX_BOOL Undo(); @@ -92,7 +92,7 @@ public: FX_BOOL Delete(); FX_BOOL DeSelect(); FWL_ERR GetBBox(CFX_RectF &rect); - FWL_ERR SetEditLimit(FX_INT32 nLimit); + FWL_ERR SetEditLimit(int32_t nLimit); FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved); protected: IFWL_DateTimePicker(); diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 18bdee662b..78072d0cf8 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -78,7 +78,7 @@ BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtAddDoRecord, FWL_EVTHASH_EDT_AddDoRecord) CFX_ByteString m_wsDoRecord; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, FWL_EVTHASH_EDT_TextChanged) -FX_INT32 nChangeType; +int32_t nChangeType; CFX_WideString wsInsert; CFX_WideString wsDelete; CFX_WideString wsPrevText; @@ -121,25 +121,25 @@ public: FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); FWL_ERR SetText(const CFX_WideString &wsText); - FX_INT32 GetTextLength() const; - FWL_ERR GetText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const; + int32_t GetTextLength() const; + FWL_ERR GetText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const; FWL_ERR ClearText(); - FX_INT32 GetCaretPos() const; - FX_INT32 SetCaretPos(FX_INT32 nIndex, FX_BOOL bBefore = TRUE); - FWL_ERR AddSelRange(FX_INT32 nStart, FX_INT32 nCount = -1); - FX_INT32 CountSelRanges(); - FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart); + int32_t GetCaretPos() const; + int32_t SetCaretPos(int32_t nIndex, FX_BOOL bBefore = TRUE); + FWL_ERR AddSelRange(int32_t nStart, int32_t nCount = -1); + int32_t CountSelRanges(); + int32_t GetSelRange(int32_t nIndex, int32_t &nStart); FWL_ERR ClearSelections(); - FX_INT32 GetLimit(); - FWL_ERR SetLimit(FX_INT32 nLimit); + int32_t GetLimit(); + FWL_ERR SetLimit(int32_t nLimit); FWL_ERR SetAliasChar(FX_WCHAR wAlias); FWL_ERR SetFormatString(const CFX_WideString &wsFormat); - FWL_ERR Insert(FX_INT32 nStart, FX_LPCWSTR lpText, FX_INT32 nLen); + FWL_ERR Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen); FWL_ERR DeleteSelections(); - FWL_ERR DeleteRange(FX_INT32 nStart, FX_INT32 nCount = -1); + FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1); FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace); - FWL_ERR Replace(FX_INT32 nStart, FX_INT32 nLen, const CFX_WideStringC &wsReplace); - FWL_ERR DoClipboard(FX_INT32 iCmd); + FWL_ERR Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace); + FWL_ERR DoClipboard(int32_t iCmd); FX_BOOL Copy(CFX_WideString &wsCopy); FX_BOOL Cut(CFX_WideString &wsCut); FX_BOOL Paste(const CFX_WideString &wsPaste); @@ -152,7 +152,7 @@ public: FX_BOOL CanRedo(); FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetOuter(IFWL_Widget *pOuter); - FWL_ERR SetNumberRange(FX_INT32 iMin, FX_INT32 iMax); + FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); FWL_ERR SetBackColor(FX_DWORD dwColor); FWL_ERR SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize); void SetScrollOffset(FX_FLOAT fScrollOffset); diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index 4b2f2555c5..466d919a5e 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -54,7 +54,7 @@ END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbDrawItem, FWL_EVTHASH_LTB_DrawItem) CFX_Graphics *m_pGraphics; CFX_Matrix m_matrix; -FX_INT32 m_index; +int32_t m_index; CFX_RectF m_rect; END_FWL_EVENT_DEF typedef struct _FWL_HLISTITEM { @@ -62,15 +62,15 @@ typedef struct _FWL_HLISTITEM { }* FWL_HLISTITEM; typedef struct _FWL_ListBoxItemData { IFWL_ListBoxDP *pDataProvider; - FX_INT32 iIndex; + int32_t iIndex; } FWL_ListBoxItemData; class IFWL_ListBoxDP : public IFWL_DataProvider { public: - virtual FX_INT32 CountItems(IFWL_Widget *pWidget) = 0; - virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex) = 0; - virtual FX_INT32 GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0; - virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex) = 0; + virtual int32_t CountItems(IFWL_Widget *pWidget) = 0; + virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, int32_t nIndex) = 0; + virtual int32_t GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0; + virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex) = 0; virtual FX_DWORD GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0; virtual FWL_ERR GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText) = 0; virtual FWL_ERR GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem) = 0; @@ -88,7 +88,7 @@ public: class IFWL_ListBoxCompare { public: - virtual FX_INT32 Compare(FWL_HLISTITEM hLeft, FWL_HLISTITEM hRight) = 0; + virtual int32_t Compare(FWL_HLISTITEM hLeft, FWL_HLISTITEM hRight) = 0; }; class IFWL_ListBox : public IFWL_Widget { @@ -96,9 +96,9 @@ public: static IFWL_ListBox* Create(); FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); - FX_INT32 CountSelItems(); - FWL_HLISTITEM GetSelItem(FX_INT32 nIndexSel); - FX_INT32 GetSelIndex(FX_INT32 nIndex); + int32_t CountSelItems(); + FWL_HLISTITEM GetSelItem(int32_t nIndexSel); + int32_t GetSelIndex(int32_t nIndex); FWL_ERR SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE); FWL_ERR GetItemText(FWL_HLISTITEM hItem, CFX_WideString &wsText); FWL_ERR GetScrollPos(FX_FLOAT &fPos, FX_BOOL bVert = TRUE); diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index 7ad8f8a364..ba6deef746 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -97,21 +97,21 @@ class IFWL_MonthCalendar; #define FWL_NOTEHASH_MCD_DATASELECTED 1085596932 #define FWL_EVTHASH_MCD_DateChanged 54212227 BEGIN_FWL_EVENT_DEF(CFWL_Event_McdDateSelected, FWL_NOTEHASH_MCD_DATASELECTED) -FX_INT32 m_iStartDay; -FX_INT32 m_iEndDay; +int32_t m_iStartDay; +int32_t m_iEndDay; END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EventMcdDateChanged, FWL_EVTHASH_MCD_DateChanged) -FX_INT32 m_iOldYear; -FX_INT32 m_iOldMonth; -FX_INT32 m_iStartDay; -FX_INT32 m_iEndDay; +int32_t m_iOldYear; +int32_t m_iOldMonth; +int32_t m_iStartDay; +int32_t m_iEndDay; END_FWL_EVENT_DEF class IFWL_MonthCalendarDP : public IFWL_DataProvider { public: - virtual FX_INT32 GetCurDay(IFWL_Widget *pWidget) = 0; - virtual FX_INT32 GetCurMonth(IFWL_Widget *pWidget) = 0; - virtual FX_INT32 GetCurYear(IFWL_Widget *pWidget) = 0; + virtual int32_t GetCurDay(IFWL_Widget *pWidget) = 0; + virtual int32_t GetCurMonth(IFWL_Widget *pWidget) = 0; + virtual int32_t GetCurYear(IFWL_Widget *pWidget) = 0; }; class IFWL_MonthCalendar : public IFWL_Widget { @@ -120,9 +120,9 @@ public: FWL_ERR Initialize(IFWL_Widget *pOuter = NULL); FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL); - FX_INT32 CountSelect(); - FX_BOOL GetSelect(FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay, FX_INT32 nIndex = 0); - FX_BOOL SetSelect(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay); + int32_t CountSelect(); + FX_BOOL GetSelect(int32_t &iYear, int32_t &iMonth, int32_t &iDay, int32_t nIndex = 0); + FX_BOOL SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay); protected: IFWL_MonthCalendar(); virtual ~IFWL_MonthCalendar(); diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index 419fd4e0d1..c6b732ca63 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -37,8 +37,8 @@ public: virtual CFX_DIBitmap* GetPicture(IFWL_Widget *pWidget) = 0; virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget *pWidget) = 0; virtual CFX_DIBitmap* GetInitialPicture(IFWL_Widget *pWidget) = 0; - virtual FX_INT32 GetOpacity(IFWL_Widget *pWidget) = 0; - virtual FX_INT32 GetFlipMode(IFWL_Widget *pWidget) = 0; + virtual int32_t GetOpacity(IFWL_Widget *pWidget) = 0; + virtual int32_t GetFlipMode(IFWL_Widget *pWidget) = 0; virtual FWL_ERR GetMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix) = 0; }; class IFWL_PictureBox : public IFWL_Widget diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h index d27b9a2638..2df14126f1 100644 --- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h +++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h @@ -24,8 +24,8 @@ class IFWL_ToolTipDP : public IFWL_DataProvider { public: virtual FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption) = 0; - virtual FX_INT32 GetInitialDelay(IFWL_Widget *pWidget) = 0; - virtual FX_INT32 GetAutoPopDelay(IFWL_Widget *pWidget) = 0; + virtual int32_t GetInitialDelay(IFWL_Widget *pWidget) = 0; + virtual int32_t GetAutoPopDelay(IFWL_Widget *pWidget) = 0; virtual CFX_DIBitmap* GetToolTipIcon(IFWL_Widget *pWidget) = 0; virtual CFX_SizeF GetToolTipIconSize(IFWL_Widget *pWidget) = 0; }; diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h index d885ac4c57..3fcd341892 100644 --- a/xfa/include/fwl/basewidget/fxmath_barcode.h +++ b/xfa/include/fwl/basewidget/fxmath_barcode.h @@ -11,30 +11,30 @@ class IFX_Barcode public: virtual void Release() = 0; virtual BC_TYPE GetType() = 0; - virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e) = 0; - virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e) = 0; - virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e) = 0; - virtual CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 height, FX_INT32 &errorCode) = 0; - virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &errorCode) = 0; + virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0; + virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0; + virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0; + virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t height, int32_t &errorCode) = 0; + virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &errorCode) = 0; virtual FX_BOOL SetCharEncoding(BC_CHAR_ENCODING encoding) = 0; - virtual FX_BOOL SetModuleHeight(FX_INT32 moduleHeight) = 0; - virtual FX_BOOL SetModuleWidth(FX_INT32 moduleWidth) = 0; - virtual FX_BOOL SetHeight(FX_INT32 height) = 0; - virtual FX_BOOL SetWidth(FX_INT32 width) = 0; + virtual FX_BOOL SetModuleHeight(int32_t moduleHeight) = 0; + virtual FX_BOOL SetModuleWidth(int32_t moduleWidth) = 0; + virtual FX_BOOL SetHeight(int32_t height) = 0; + virtual FX_BOOL SetWidth(int32_t width) = 0; virtual FX_BOOL CheckContentValidity(FX_WSTR contents) = 0; virtual FX_BOOL SetPrintChecksum(FX_BOOL checksum) = 0; - virtual FX_BOOL SetDataLength(FX_INT32 length) = 0; - virtual FX_BOOL SetCalChecksum(FX_INT32 state) = 0; + virtual FX_BOOL SetDataLength(int32_t length) = 0; + virtual FX_BOOL SetCalChecksum(int32_t state) = 0; virtual FX_BOOL SetFont(CFX_Font* pFont) = 0; virtual FX_BOOL SetFontSize(FX_FLOAT size) = 0; - virtual FX_BOOL SetFontStyle(FX_INT32 style) = 0; + virtual FX_BOOL SetFontStyle(int32_t style) = 0; virtual FX_BOOL SetFontColor(FX_ARGB color) = 0; virtual FX_BOOL SetTextLocation(BC_TEXT_LOC location) = 0; - virtual FX_BOOL SetWideNarrowRatio(FX_INT32 ratio) = 0; + virtual FX_BOOL SetWideNarrowRatio(int32_t ratio) = 0; virtual FX_BOOL SetStartChar(FX_CHAR start) = 0; virtual FX_BOOL SetEndChar(FX_CHAR end) = 0; - virtual FX_BOOL SetVersion(FX_INT32 version) = 0; - virtual FX_BOOL SetErrorCorrectionLevel (FX_INT32 level) = 0; + virtual FX_BOOL SetVersion(int32_t version) = 0; + virtual FX_BOOL SetErrorCorrectionLevel (int32_t level) = 0; virtual FX_BOOL SetTruncated(FX_BOOL truncated) = 0; }; IFX_Barcode* FX_Barcode_Create(BC_TYPE type); -- cgit v1.2.3