diff options
| author | tsepez <tsepez@chromium.org> | 2016-10-28 11:34:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-28 11:34:42 -0700 |
| commit | 95e5834ab6b6e5aa370cacd6266cecbd82c4c155 (patch) | |
| tree | a948ed773fe1faad6a6b2f4111e8f0c897ef4f40 /fpdfsdk | |
| parent | 159ba95782e0610b217c42a60bbfbd99737e0771 (diff) | |
| download | pdfium-95e5834ab6b6e5aa370cacd6266cecbd82c4c155.tar.xz | |
Continue fixing FX_BOOL / int noise
Review-Url: https://codereview.chromium.org/2459073002
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_dataavail.cpp | 4 | ||||
| -rw-r--r-- | fpdfsdk/fpdf_sysfontinfo.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp index d93e309d2f..f729f717d9 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp +++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp @@ -766,5 +766,5 @@ FX_BOOL CPDFSDK_FormFillEnvironment::KillFocusAnnot(uint32_t nFlag) { } FX_BOOL CPDFSDK_FormFillEnvironment::GetPermissions(int nFlag) { - return GetPDFDocument()->GetUserPermissions() & nFlag; + return !!(GetPDFDocument()->GetUserPermissions() & nFlag); } diff --git a/fpdfsdk/fpdf_dataavail.cpp b/fpdfsdk/fpdf_dataavail.cpp index 45d3b2aa5d..481dd3b60f 100644 --- a/fpdfsdk/fpdf_dataavail.cpp +++ b/fpdfsdk/fpdf_dataavail.cpp @@ -50,7 +50,7 @@ class CFPDF_FileAvailWrap : public CPDF_DataAvail::FileAvail { // CPDF_DataAvail::FileAvail: FX_BOOL IsDataAvail(FX_FILESIZE offset, uint32_t size) override { - return m_pfileAvail->IsDataAvail(m_pfileAvail, offset, size); + return !!m_pfileAvail->IsDataAvail(m_pfileAvail, offset, size); } private: @@ -117,7 +117,7 @@ DLLEXPORT FPDF_AVAIL STDCALL FPDFAvail_Create(FX_FILEAVAIL* file_avail, pAvail->m_FileAvail.Set(file_avail); pAvail->m_FileRead.Set(file); pAvail->m_pDataAvail = pdfium::MakeUnique<CPDF_DataAvail>( - &pAvail->m_FileAvail, &pAvail->m_FileRead, TRUE); + &pAvail->m_FileAvail, &pAvail->m_FileRead, true); return pAvail; } diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 5f80ca0860..bfd45e8d2b 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -129,8 +129,8 @@ static void* DefaultMapFont(struct _FPDF_SYSFONTINFO* pThis, const char* family, int* bExact) { auto* pDefault = static_cast<FPDF_SYSFONTINFO_DEFAULT*>(pThis); - return pDefault->m_pFontInfo->MapFont(weight, bItalic, charset, pitch_family, - family, *bExact); + return pDefault->m_pFontInfo->MapFont(weight, !!bItalic, charset, + pitch_family, family, *bExact); } void* DefaultGetFont(struct _FPDF_SYSFONTINFO* pThis, const char* family) { |