diff options
| author | tsepez <tsepez@chromium.org> | 2016-03-25 14:38:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 14:38:58 -0700 |
| commit | deee3d2ee201d62e7ef41e7d8378d7f52e057a9c (patch) | |
| tree | f9f64d5f24376108a697299f8574ae3a7fe3511b /xfa/fxbarcode | |
| parent | 736f28ab2434e2da1de66ff91b64741483ff9cba (diff) | |
| download | pdfium-deee3d2ee201d62e7ef41e7d8378d7f52e057a9c.tar.xz | |
Remove FX_DWORD from XFA, part 2
Some headers were missed in the previous CL.
Review URL: https://codereview.chromium.org/1835703002
Diffstat (limited to 'xfa/fxbarcode')
| -rw-r--r-- | xfa/fxbarcode/oned/BC_OneDimWriter.h | 2 | ||||
| -rw-r--r-- | xfa/fxbarcode/pdf417/BC_PDF417Common.h | 4 | ||||
| -rw-r--r-- | xfa/fxbarcode/utils.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/xfa/fxbarcode/oned/BC_OneDimWriter.h index b015070968..e504f0bacb 100644 --- a/xfa/fxbarcode/oned/BC_OneDimWriter.h +++ b/xfa/fxbarcode/oned/BC_OneDimWriter.h @@ -109,7 +109,7 @@ class CBC_OneDimWriter : public CBC_Writer { CFX_Font* m_pFont; FX_FLOAT m_fFontSize; int32_t m_iFontStyle; - FX_DWORD m_fontColor; + uint32_t m_fontColor; BC_TEXT_LOC m_locTextLoc; int32_t m_iContentLen; FX_BOOL m_bLeftPadding; diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Common.h b/xfa/fxbarcode/pdf417/BC_PDF417Common.h index 5e05b542e6..c72d66410e 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417Common.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417Common.h @@ -14,7 +14,7 @@ class CBC_PDF417Common { CBC_PDF417Common(); virtual ~CBC_PDF417Common(); static int32_t getBitCountSum(CFX_Int32Array& moduleBitCount); - static int32_t getCodeword(FX_DWORD symbol); + static int32_t getCodeword(uint32_t symbol); static const int32_t NUMBER_OF_CODEWORDS = 929; static const int32_t MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1; static const int32_t MIN_ROWS_IN_BARCODE = 3; @@ -28,7 +28,7 @@ class CBC_PDF417Common { private: static CFX_Int32Array* EMPTY_INT_ARRAY; - static int32_t findCodewordIndex(FX_DWORD symbol); + static int32_t findCodewordIndex(uint32_t symbol); }; #endif // XFA_FXBARCODE_PDF417_BC_PDF417COMMON_H_ diff --git a/xfa/fxbarcode/utils.h b/xfa/fxbarcode/utils.h index 60d4754096..da10555e2e 100644 --- a/xfa/fxbarcode/utils.h +++ b/xfa/fxbarcode/utils.h @@ -11,8 +11,8 @@ typedef CFX_MapPtrTemplate<void*, int32_t> CFX_PtrToInt32; FX_BOOL BC_FX_ByteString_Replace(CFX_ByteString& dst, - FX_DWORD first, - FX_DWORD last, + uint32_t first, + uint32_t last, int32_t count, FX_CHAR c); void BC_FX_ByteString_Append(CFX_ByteString& dst, int32_t count, FX_CHAR c); |