From bb17868d736f698d5217c30d52c5bbfed62c5936 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 11:30:25 -0700 Subject: Use stdint.h types throughout PDFium. It's redundant nowadays to provide our own equivalents, now that this is done for us by the system header. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1177483002 --- fpdfsdk/src/fsdk_baseform.cpp | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'fpdfsdk/src/fsdk_baseform.cpp') diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 8b0738a8d4..8d62a16ff4 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -456,7 +456,7 @@ void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice, CPDFSDK_PageView* pPa // { CPDF_Rect rc = GetRect(); FX_COLORREF color = m_pInterForm->GetHighlightColor(nFieldType); - FX_BYTE alpha = m_pInterForm->GetHighlightAlpha(); + uint8_t alpha = m_pInterForm->GetHighlightAlpha(); CFX_FloatRect rcDevice; ASSERT(m_pInterForm->GetDocument()); @@ -488,7 +488,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() CPDF_Rect rcWindow = GetRotatedRect(); - FX_INT32 nLayout = 0; + int32_t nLayout = 0; switch (pControl->GetTextPosition()) { @@ -529,7 +529,7 @@ void CPDFSDK_Widget::ResetAppearance_PushButton() crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]); FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth(); - FX_INT32 nBorderStyle = 0; + int32_t nBorderStyle = 0; CPWL_Dash dsBorder(3,0,0); CPWL_Color crLeftTop,crRightBottom; @@ -735,7 +735,7 @@ void CPDFSDK_Widget::ResetAppearance_CheckBox() crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]); FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth(); - FX_INT32 nBorderStyle = 0; + int32_t nBorderStyle = 0; CPWL_Dash dsBorder(3,0,0); CPWL_Color crLeftTop,crRightBottom; @@ -775,7 +775,7 @@ void CPDFSDK_Widget::ResetAppearance_CheckBox() crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]); } - FX_INT32 nStyle = 0; + int32_t nStyle = 0; CFX_WideString csWCaption = pControl->GetNormalCaption(); if (csWCaption.GetLength() > 0) @@ -867,7 +867,7 @@ void CPDFSDK_Widget::ResetAppearance_RadioButton() crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]); FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth(); - FX_INT32 nBorderStyle = 0; + int32_t nBorderStyle = 0; CPWL_Dash dsBorder(3,0,0); CPWL_Color crLeftTop,crRightBottom; @@ -907,7 +907,7 @@ void CPDFSDK_Widget::ResetAppearance_RadioButton() crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]); } - FX_INT32 nStyle = 0; + int32_t nStyle = 0; CFX_WideString csWCaption = pControl->GetNormalCaption(); if (csWCaption.GetLength() > 0) @@ -1069,7 +1069,7 @@ void CPDFSDK_Widget::ResetAppearance_ComboBox(FX_LPCWSTR sValue) pEdit->SetText(sValue); else { - FX_INT32 nCurSel = pField->GetSelectedIndex(0); + int32_t nCurSel = pField->GetSelectedIndex(0); if (nCurSel < 0) pEdit->SetText(pField->GetValue().c_str()); @@ -1143,14 +1143,14 @@ void CPDFSDK_Widget::ResetAppearance_ListBox() CFX_ByteTextBuf sList; FX_FLOAT fy = rcClient.top; - FX_INT32 nTop = pField->GetTopVisibleIndex(); - FX_INT32 nCount = pField->CountOptions(); - FX_INT32 nSelCount = pField->CountSelectedItems(); + int32_t nTop = pField->GetTopVisibleIndex(); + int32_t nCount = pField->CountOptions(); + int32_t nSelCount = pField->CountSelectedItems(); - for (FX_INT32 i=nTop; iGetSelectedIndex(j) == i) { @@ -1310,7 +1310,7 @@ void CPDFSDK_Widget::ResetAppearance_TextField(FX_LPCWSTR sValue) sLines << "q\n" << GetBorderWidth() << " w\n" << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE) << " 2 J 0 j\n"; - for (FX_INT32 i=1;iGetDefaultAppearance(); if (da.HasColor()) { - FX_INT32 iColorType; + int32_t iColorType; FX_FLOAT fc[4]; da.GetColor(iColorType, fc); crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]); @@ -1506,7 +1506,7 @@ CPWL_Color CPDFSDK_Widget::GetBorderPWLColor() const CPDF_FormControl* pFormCtrl = GetFormControl(); ASSERT(pFormCtrl != NULL); - FX_INT32 iColorType; + int32_t iColorType; FX_FLOAT fc[4]; pFormCtrl->GetOriginalBorderColor(iColorType, fc); if (iColorType > 0) @@ -1522,7 +1522,7 @@ CPWL_Color CPDFSDK_Widget::GetFillPWLColor() const CPDF_FormControl* pFormCtrl = GetFormControl(); ASSERT(pFormCtrl != NULL); - FX_INT32 iColorType; + int32_t iColorType; FX_FLOAT fc[4]; pFormCtrl->GetOriginalBackgroundColor(iColorType, fc); if (iColorType > 0) @@ -1643,12 +1643,12 @@ CFX_WideString CPDFSDK_Widget::GetAlternateName() const return pFormField->GetAlternateName(); } -FX_INT32 CPDFSDK_Widget::GetAppearanceAge() const +int32_t CPDFSDK_Widget::GetAppearanceAge() const { return m_nAppAge; } -FX_INT32 CPDFSDK_Widget::GetValueAge() const +int32_t CPDFSDK_Widget::GetValueAge() const { return m_nValueAge; } @@ -1898,7 +1898,7 @@ CPDF_Stream* CPDFSDK_InterForm::LoadImageFromFile(const CFX_WideString& sFile) pRetStream = new CPDF_Stream(NULL, 0, NULL); CFX_ByteString csStream; csStream.Format("q\n%d 0 0 %d 0 0 cm\n/Img Do\nQ", nWidth, nHeight); - pRetStream->InitStream((FX_BYTE*)csStream.c_str(), csStream.GetLength(), pStreamDict); + pRetStream->InitStream((uint8_t*)csStream.c_str(), csStream.GetLength(), pStreamDict); pDocument->AddIndirectObject(pRetStream); } @@ -2345,7 +2345,7 @@ FX_BOOL CPDFSDK_InterForm::FDFToURLEncodedData(FX_LPBYTE& pBuf, FX_STRSIZE& nBuf } nBufSize = fdfEncodedData.GetLength(); - pBuf = FX_Alloc(FX_BYTE, nBufSize); + pBuf = FX_Alloc(uint8_t, nBufSize); FXSYS_memcpy(pBuf, fdfEncodedData.GetBuffer(), nBufSize); } return TRUE; -- cgit v1.2.3