diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
| commit | 1f3442ce5c035d22e2cc9fffc203892f2f749373 (patch) | |
| tree | 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95 /fpdfsdk | |
| parent | 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (diff) | |
| download | pdfium-1f3442ce5c035d22e2cc9fffc203892f2f749373.tar.xz | |
Merge to XFA: FX_BOOL combo patch.
Original Review URL: https://codereview.chromium.org/1257503002
Original Review URL: https://codereview.chromium.org/1253603002
Manual merge for:
core/include/fxge/fx_font.h
core/src/fxcodec/codec/codec_int.h
fpdfsdk/src/javascript/PublicMethods.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1248153004 .
Diffstat (limited to 'fpdfsdk')
| -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 | 26 |
3 files changed, 16 insertions, 16 deletions
diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index 85b83a6ed2..18d0af06a5 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 ad6e042179..e49d74e1cb 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -44,7 +44,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 c5cc84cc23..abb95f052d 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 bNagative = FALSE; + int iNegative = 0; - strValue = fcvt(dValue,iDec,&iDec2,&bNagative); + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); if (strValue.IsEmpty()) { dValue = 0; - strValue = fcvt(dValue,iDec,&iDec2,&bNagative); + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); if (strValue.IsEmpty()) { strValue = "0"; @@ -1125,9 +1125,9 @@ FX_BOOL CJS_PublicMethods::AFNumber_Format(IFXJS_Context* cc, const CJS_Paramete else cSeperator = '.'; - int iDecPositive,iDecNagative; + int iDecPositive,iDecNegative; iDecPositive = iDec2; - iDecNagative = iDec2; + iDecNegative = iDec2; for (iDecPositive = iDec2 -3; iDecPositive > 0;iDecPositive -= 3) { @@ -1151,7 +1151,7 @@ FX_BOOL CJS_PublicMethods::AFNumber_Format(IFXJS_Context* cc, const CJS_Paramete ///////////////////////////////////////////////////////////////////////// //for processing negative style - if (bNagative) + if (iNegative) { if (iNegStyle == 0) { @@ -1394,12 +1394,12 @@ FX_BOOL CJS_PublicMethods::AFPercent_Format(IFXJS_Context* cc, const CJS_Paramet dValue += DOUBLE_CORRECT;//УÕý int iDec2; - FX_BOOL bNagative = FALSE; - strValue = fcvt(dValue,iDec,&iDec2,&bNagative); + int iNegative = 0; + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); if (strValue.IsEmpty()) { dValue = 0; - strValue = fcvt(dValue,iDec,&iDec2,&bNagative); + strValue = fcvt(dValue, iDec, &iDec2, &iNegative); } if (iDec2 < 0) @@ -1446,9 +1446,9 @@ FX_BOOL CJS_PublicMethods::AFPercent_Format(IFXJS_Context* cc, const CJS_Paramet else cSeperator = '.'; - int iDecPositive,iDecNagative; + int iDecPositive,iDecNegative; iDecPositive = iDec2; - iDecNagative = iDec2; + iDecNegative = iDec2; for (iDecPositive = iDec2 -3; iDecPositive > 0; iDecPositive -= 3) { @@ -1457,8 +1457,8 @@ FX_BOOL CJS_PublicMethods::AFPercent_Format(IFXJS_Context* cc, const CJS_Paramet } } //////////////////////////////////////////////////////////////////// - //nagative mark - if(bNagative) + //negative mark + if (iNegative) strValue = "-" + strValue; strValue += "%"; Value = CFX_WideString::FromLocal(strValue); |