diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 11:34:44 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 11:34:44 -0700 |
| commit | 065e9321b84fc0490f3da9099e8840c65e06868d (patch) | |
| tree | 3b0bb772a59669f06b86824a444fd06642592d4b /fpdfsdk/src | |
| parent | 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 (diff) | |
| download | pdfium-065e9321b84fc0490f3da9099e8840c65e06868d.tar.xz | |
Fix FX_BOOL type mismatches.
Extracted from https://codereview.chromium.org/1252613002/
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1253603002 .
Diffstat (limited to 'fpdfsdk/src')
| -rw-r--r-- | fpdfsdk/src/fpdf_sysfontinfo.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/src/fpdf_transformpage.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/PublicMethods.cpp | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index 249055d344..cf0cdd915b 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -29,10 +29,10 @@ public: return FALSE; } - virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, FX_BOOL& bExact) override + virtual void* MapFont(int weight, FX_BOOL bItalic, int charset, int pitch_family, const FX_CHAR* family, int& iExact) override { if (m_pInfo->MapFont) - return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &bExact); + return m_pInfo->MapFont(m_pInfo, weight, bItalic, charset, pitch_family, family, &iExact); return NULL; } diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 5ede62692b..a29db5a9dc 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -39,7 +39,7 @@ DLLEXPORT void STDCALL FPDFPage_SetCropBox(FPDF_PAGE page, float left, float bot } -DLLEXPORT FX_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, float* left, float* bottom, float* right, float* top) +DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, float* left, float* bottom, float* right, float* top) { if(!page) return FALSE; diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index b8967c4d53..daecdbec89 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -1066,13 +1066,13 @@ FX_BOOL CJS_PublicMethods::AFNumber_Format(IFXJS_Context* cc, const CJS_Paramete dValue += DOUBLE_CORRECT; int iDec2; - FX_BOOL bNegative = FALSE; + int iNegative = 0; - strValue = fcvt(dValue,iDec,&iDec2,&bNegative); + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); if (strValue.IsEmpty()) { dValue = 0; - strValue = fcvt(dValue,iDec,&iDec2,&bNegative); + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); if (strValue.IsEmpty()) { strValue = "0"; @@ -1150,7 +1150,7 @@ FX_BOOL CJS_PublicMethods::AFNumber_Format(IFXJS_Context* cc, const CJS_Paramete ///////////////////////////////////////////////////////////////////////// //for processing negative style - if (bNegative) + if (iNegative) { if (iNegStyle == 0) { @@ -1393,12 +1393,12 @@ FX_BOOL CJS_PublicMethods::AFPercent_Format(IFXJS_Context* cc, const CJS_Paramet dValue += DOUBLE_CORRECT;//УÕý int iDec2; - FX_BOOL bNegative = FALSE; - strValue = fcvt(dValue,iDec,&iDec2,&bNegative); + int iNegative = 0; + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); if (strValue.IsEmpty()) { dValue = 0; - strValue = fcvt(dValue,iDec,&iDec2,&bNegative); + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); } if (iDec2 < 0) @@ -1456,7 +1456,7 @@ FX_BOOL CJS_PublicMethods::AFPercent_Format(IFXJS_Context* cc, const CJS_Paramet } //////////////////////////////////////////////////////////////////// //negative mark - if(bNegative) + if (iNegative) strValue = "-" + strValue; strValue += "%"; Value = CFX_WideString::FromLocal(strValue); |