diff options
| author | tsepez <tsepez@chromium.org> | 2016-03-25 14:52:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 14:52:28 -0700 |
| commit | c3255f55954b2adc3edbd3269c0a8779f7d4b7ad (patch) | |
| tree | 802c0e9158e14f1e67ad181089739a176e8fba24 /fpdfsdk/include/fsdk_define.h | |
| parent | deee3d2ee201d62e7ef41e7d8378d7f52e057a9c (diff) | |
| download | pdfium-c3255f55954b2adc3edbd3269c0a8779f7d4b7ad.tar.xz | |
Remove FX_DWORD from fpdfsdk/ and testing
BUG=
Review URL: https://codereview.chromium.org/1835693002
Diffstat (limited to 'fpdfsdk/include/fsdk_define.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_define.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 4af327fc93..706880ab72 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -25,13 +25,13 @@ // Convert a #FX_ARGB to a #FX_COLORREF. #define FX_ARGBTOCOLORREF(argb) \ - ((((FX_DWORD)argb & 0x00FF0000) >> 16) | ((FX_DWORD)argb & 0x0000FF00) | \ - (((FX_DWORD)argb & 0x000000FF) << 16)) + ((((uint32_t)argb & 0x00FF0000) >> 16) | ((uint32_t)argb & 0x0000FF00) | \ + (((uint32_t)argb & 0x000000FF) << 16)) // Convert a #FX_COLORREF to a #FX_ARGB. #define FX_COLORREFTOARGB(rgb) \ - ((FX_DWORD)0xFF000000 | (((FX_DWORD)rgb & 0x000000FF) << 16) | \ - ((FX_DWORD)rgb & 0x0000FF00) | (((FX_DWORD)rgb & 0x00FF0000) >> 16)) + ((uint32_t)0xFF000000 | (((uint32_t)rgb & 0x000000FF) << 16) | \ + ((uint32_t)rgb & 0x0000FF00) | (((uint32_t)rgb & 0x00FF0000) >> 16)) typedef unsigned int FX_UINT; class CRenderContext; @@ -49,15 +49,15 @@ class CPDF_CustomAccess final : public IFX_FileRead { #ifdef PDF_ENABLE_XFA virtual CFX_ByteString GetFullPath() { return ""; } - virtual FX_BOOL GetByte(FX_DWORD pos, uint8_t& ch); - virtual FX_BOOL GetBlock(FX_DWORD pos, uint8_t* pBuf, FX_DWORD size); + virtual FX_BOOL GetByte(uint32_t pos, uint8_t& ch); + virtual FX_BOOL GetBlock(uint32_t pos, uint8_t* pBuf, uint32_t size); #endif // PDF_ENABLE_XFA private: FPDF_FILEACCESS m_FileAccess; #ifdef PDF_ENABLE_XFA uint8_t m_Buffer[512]; - FX_DWORD m_BufferOffset; + uint32_t m_BufferOffset; #endif // PDF_ENABLE_XFA }; @@ -124,7 +124,7 @@ void FPDF_RenderPage_Retail(CRenderContext* pContext, FX_BOOL bNeedToRestore, IFSDK_PAUSE_Adapter* pause); -void CheckUnSupportError(CPDF_Document* pDoc, FX_DWORD err_code); +void CheckUnSupportError(CPDF_Document* pDoc, uint32_t err_code); void CheckUnSupportAnnot(CPDF_Document* pDoc, const CPDF_Annot* pPDFAnnot); void ProcessParseError(CPDF_Parser::Error err); |