From ff46aaf499edcf153ee2f57c7016587aa96dcfa0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 11:55:29 -0700 Subject: FX Bool considered harmful, part 3 Try to reland this patch after fixing underlying issues that caused it to be reverted. fx_system.h is the only manual edit. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1258093002 . --- core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp') diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp index aabfd141d6..739a0bdf04 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp @@ -57,7 +57,7 @@ CPDF_Image* CPDF_Image::Clone() CPDF_Image* pImage = new CPDF_Image(m_pDocument); pImage->LoadImageF((CPDF_Stream*)((CPDF_Object*)m_pStream)->Clone(), m_bInline); if (m_bInline) { - CPDF_Dictionary *pInlineDict = (CPDF_Dictionary*)m_pInlineDict->Clone(TRUE); + CPDF_Dictionary *pInlineDict = (CPDF_Dictionary*)m_pInlineDict->Clone(true); pImage->SetInlineDict(pInlineDict); } return pImage; @@ -67,7 +67,7 @@ CPDF_Image::CPDF_Image(CPDF_Document* pDoc) m_pDocument = pDoc; m_pStream = NULL; m_pOC = NULL; - m_bInline = FALSE; + m_bInline = false; m_pInlineDict = NULL; m_pDIBSource = NULL; m_pMask = NULL; @@ -84,7 +84,7 @@ CPDF_Image::~CPDF_Image() } } } -FX_BOOL CPDF_Image::LoadImageF(CPDF_Stream* pStream, FX_BOOL bInline) +bool CPDF_Image::LoadImageF(CPDF_Stream* pStream, bool bInline) { m_pStream = pStream; if (m_bInline && m_pInlineDict) { @@ -101,5 +101,5 @@ FX_BOOL CPDF_Image::LoadImageF(CPDF_Stream* pStream, FX_BOOL bInline) m_bInterpolate = pDict->GetInteger(FX_BSTRC("Interpolate")); m_Height = pDict->GetInteger(FX_BSTRC("Height")); m_Width = pDict->GetInteger(FX_BSTRC("Width")); - return TRUE; + return true; } -- cgit v1.2.3