Use CPDF_DIBSource::LoadState enum class in more places. Change-Id: Iaf124c1b1ceca86d220ae654d9d18af7475209b6 Reviewed-on: https://pdfium-review.googlesource.com/27870 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index 24f58df..8ce4185 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -348,15 +348,15 @@ uint32_t GroupFamily, bool bLoadMask) { auto source = pdfium::MakeRetain<CPDF_DIBSource>(); - int ret = source->StartLoadDIBSource(m_pDocument.Get(), m_pStream.Get(), true, - pFormResource, pPageResource, bStdCS, - GroupFamily, bLoadMask); - if (ret == 0) { + CPDF_DIBSource::LoadState ret = source->StartLoadDIBSource( + m_pDocument.Get(), m_pStream.Get(), true, pFormResource, pPageResource, + bStdCS, GroupFamily, bLoadMask); + if (ret == CPDF_DIBSource::LoadState::kFail) { m_pDIBSource.Reset(); return false; } m_pDIBSource = source; - if (ret == 2) + if (ret == CPDF_DIBSource::LoadState::kContinue) return true; m_pMask = source->DetachMask(); @@ -366,11 +366,11 @@ bool CPDF_Image::Continue(IFX_PauseIndicator* pPause) { RetainPtr<CPDF_DIBSource> pSource = m_pDIBSource.As<CPDF_DIBSource>(); - int ret = pSource->ContinueLoadDIBSource(pPause); - if (ret == 2) + CPDF_DIBSource::LoadState ret = pSource->ContinueLoadDIBSource(pPause); + if (ret == CPDF_DIBSource::LoadState::kContinue) return true; - if (ret == 1) { + if (ret == CPDF_DIBSource::LoadState::kSuccess) { m_pMask = pSource->DetachMask(); m_MatteColor = pSource->GetMatteColor(); } else {
diff --git a/core/fpdfapi/render/cpdf_dibsource.cpp b/core/fpdfapi/render/cpdf_dibsource.cpp index 1233992..8a75237 100644 --- a/core/fpdfapi/render/cpdf_dibsource.cpp +++ b/core/fpdfapi/render/cpdf_dibsource.cpp
@@ -156,7 +156,7 @@ if (m_pStreamAcc->GetSize() == 0 || !m_pStreamAcc->GetData()) return false; - if (!CreateDecoder()) + if (CreateDecoder() == LoadState::kFail) return false; if (m_bImageMask) { @@ -227,16 +227,17 @@ return true; } -int CPDF_DIBSource::StartLoadDIBSource(CPDF_Document* pDoc, - const CPDF_Stream* pStream, - bool bHasMask, - CPDF_Dictionary* pFormResources, - CPDF_Dictionary* pPageResources, - bool bStdCS, - uint32_t GroupFamily, - bool bLoadMask) { +CPDF_DIBSource::LoadState CPDF_DIBSource::StartLoadDIBSource( + CPDF_Document* pDoc, + const CPDF_Stream* pStream, + bool bHasMask, + CPDF_Dictionary* pFormResources, + CPDF_Dictionary* pPageResources, + bool bStdCS, + uint32_t GroupFamily, + bool bLoadMask) { if (!pStream) - return 0; + return LoadState::kFail; m_pDocument = pDoc; m_pDict = pStream->GetDict(); @@ -247,55 +248,58 @@ m_Height = m_pDict->GetIntegerFor("Height"); if (m_Width <= 0 || m_Height <= 0 || m_Width > kMaxImageDimension || m_Height > kMaxImageDimension) { - return 0; + return LoadState::kFail; } m_GroupFamily = GroupFamily; m_bLoadMask = bLoadMask; if (!LoadColorInfo(m_pStream->IsInline() ? pFormResources : nullptr, pPageResources)) { - return 0; + return LoadState::kFail; } if (m_bDoBpcCheck && (m_bpc == 0 || m_nComponents == 0)) - return 0; + return LoadState::kFail; FX_SAFE_UINT32 src_size = CalculatePitch8(m_bpc, m_nComponents, m_Width) * m_Height; if (!src_size.IsValid()) - return 0; + return LoadState::kFail; m_pStreamAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); m_pStreamAcc->LoadAllData(false, src_size.ValueOrDie(), true); if (m_pStreamAcc->GetSize() == 0 || !m_pStreamAcc->GetData()) - return 0; + return LoadState::kFail; - int iCreatedDecoder = CreateDecoder(); - if (!iCreatedDecoder) - return 0; + LoadState iCreatedDecoder = CreateDecoder(); + if (iCreatedDecoder == LoadState::kFail) + return LoadState::kFail; if (!ContinueToLoadMask()) - return 0; + return LoadState::kFail; - int iLoadedMask = m_bHasMask ? StartLoadMask() : 1; - if (iCreatedDecoder == 2 || iLoadedMask == 2) - return 2; + LoadState iLoadedMask = m_bHasMask ? StartLoadMask() : LoadState::kSuccess; + if (iCreatedDecoder == LoadState::kContinue || + iLoadedMask == LoadState::kContinue) { + return LoadState::kContinue; + } - ASSERT(iCreatedDecoder == 1); - ASSERT(iLoadedMask == 1); + ASSERT(iCreatedDecoder == LoadState::kSuccess); + ASSERT(iLoadedMask == LoadState::kSuccess); if (m_pColorSpace && m_bStdCS) m_pColorSpace->EnableStdConversion(false); - return 1; + return LoadState::kSuccess; } -int CPDF_DIBSource::ContinueLoadDIBSource(IFX_PauseIndicator* pPause) { +CPDF_DIBSource::LoadState CPDF_DIBSource::ContinueLoadDIBSource( + IFX_PauseIndicator* pPause) { if (m_Status == LoadState::kContinue) return ContinueLoadMaskDIB(pPause); if (m_Status == LoadState::kFail) - return 0; + return LoadState::kFail; const ByteString& decoder = m_pStreamAcc->GetImageDecoder(); if (decoder == "JPXDecode") - return 0; + return LoadState::kFail; FXCODEC_STATUS iDecodeStatus; CCodec_Jbig2Module* pJbig2Module = CPDF_ModuleMgr::Get()->GetJbig2Module(); @@ -321,18 +325,18 @@ m_pJbig2Context.reset(); m_pCachedBitmap.Reset(); m_pGlobalStream.Reset(); - return 0; + return LoadState::kFail; } if (iDecodeStatus == FXCODEC_STATUS_DECODE_TOBECONTINUE) - return 2; + return LoadState::kContinue; - int iContinueStatus = 1; + LoadState iContinueStatus = LoadState::kSuccess; if (m_bHasMask) { iContinueStatus = ContinueLoadMaskDIB(pPause); m_Status = LoadState::kContinue; } - if (iContinueStatus == 2) - return 2; + if (iContinueStatus == LoadState::kContinue) + return LoadState::kContinue; if (m_pColorSpace && m_bStdCS) m_pColorSpace->EnableStdConversion(false); @@ -451,27 +455,28 @@ return pCompData; } -int CPDF_DIBSource::CreateDecoder() { +CPDF_DIBSource::LoadState CPDF_DIBSource::CreateDecoder() { const ByteString& decoder = m_pStreamAcc->GetImageDecoder(); if (decoder.IsEmpty()) - return 1; + return LoadState::kSuccess; if (m_bDoBpcCheck && m_bpc == 0) - return 0; + return LoadState::kFail; if (decoder == "JPXDecode") { m_pCachedBitmap = LoadJpxBitmap(); - return m_pCachedBitmap ? 1 : 0; + return m_pCachedBitmap ? LoadState::kSuccess : LoadState::kFail; } + if (decoder == "JBIG2Decode") { m_pCachedBitmap = pdfium::MakeRetain<CFX_DIBitmap>(); if (!m_pCachedBitmap->Create( m_Width, m_Height, m_bImageMask ? FXDIB_1bppMask : FXDIB_1bppRgb)) { m_pCachedBitmap.Reset(); - return 0; + return LoadState::kFail; } m_Status = LoadState::kSuccess; - return 2; + return LoadState::kContinue; } const uint8_t* src_data = m_pStreamAcc->GetData(); @@ -489,22 +494,22 @@ src_data, src_size, m_Width, m_Height, m_nComponents, m_bpc); } else if (decoder == "DCTDecode") { if (!CreateDCTDecoder(src_data, src_size, pParams)) - return 0; + return LoadState::kFail; } if (!m_pDecoder) - return 0; + return LoadState::kFail; FX_SAFE_UINT32 requested_pitch = CalculatePitch8(m_bpc, m_nComponents, m_Width); if (!requested_pitch.IsValid()) - return 0; + return LoadState::kFail; FX_SAFE_UINT32 provided_pitch = CalculatePitch8( m_pDecoder->GetBPC(), m_pDecoder->CountComps(), m_pDecoder->GetWidth()); if (!provided_pitch.IsValid()) - return 0; + return LoadState::kFail; if (provided_pitch.ValueOrDie() < requested_pitch.ValueOrDie()) - return 0; - return 1; + return LoadState::kFail; + return LoadState::kSuccess; } bool CPDF_DIBSource::CreateDCTDecoder(const uint8_t* src_data, @@ -641,6 +646,7 @@ pCachedBitmap->GetPitch(), output_offsets)) { return nullptr; } + if (m_pColorSpace && m_pColorSpace->GetFamily() == PDFCS_INDEXED && m_bpc < 8) { int scale = 8 - m_bpc; @@ -656,7 +662,7 @@ return pCachedBitmap; } -int CPDF_DIBSource::StartLoadMask() { +CPDF_DIBSource::LoadState CPDF_DIBSource::StartLoadMask() { m_MatteColor = 0XFFFFFFFF; m_pMaskStream = m_pDict->GetStreamFor("SMask"); if (m_pMaskStream) { @@ -676,45 +682,44 @@ } m_pMaskStream = ToStream(m_pDict->GetDirectObjectFor("Mask")); - return m_pMaskStream ? StartLoadMaskDIB() : 1; + return m_pMaskStream ? StartLoadMaskDIB() : LoadState::kSuccess; } -int CPDF_DIBSource::ContinueLoadMaskDIB(IFX_PauseIndicator* pPause) { +CPDF_DIBSource::LoadState CPDF_DIBSource::ContinueLoadMaskDIB( + IFX_PauseIndicator* pPause) { if (!m_pMask) - return 1; + return LoadState::kSuccess; - int ret = m_pMask->ContinueLoadDIBSource(pPause); - if (ret == 2) - return 2; + LoadState ret = m_pMask->ContinueLoadDIBSource(pPause); + if (ret == LoadState::kContinue) + return LoadState::kContinue; if (m_pColorSpace && m_bStdCS) m_pColorSpace->EnableStdConversion(false); - if (!ret) { + if (ret == LoadState::kFail) { m_pMask.Reset(); - return 0; + return LoadState::kFail; } - return 1; + return LoadState::kSuccess; } RetainPtr<CPDF_DIBSource> CPDF_DIBSource::DetachMask() { return std::move(m_pMask); } -int CPDF_DIBSource::StartLoadMaskDIB() { +CPDF_DIBSource::LoadState CPDF_DIBSource::StartLoadMaskDIB() { m_pMask = pdfium::MakeRetain<CPDF_DIBSource>(); - int ret = m_pMask->StartLoadDIBSource(m_pDocument.Get(), m_pMaskStream.Get(), - false, nullptr, nullptr, true); - if (ret == 2) { + LoadState ret = m_pMask->StartLoadDIBSource( + m_pDocument.Get(), m_pMaskStream.Get(), false, nullptr, nullptr, true); + if (ret == LoadState::kContinue) { if (m_Status == LoadState::kFail) m_Status = LoadState::kContinue; - return 2; + return LoadState::kContinue; } - if (!ret) { + if (ret == LoadState::kFail) m_pMask.Reset(); - return 1; - } - return 1; + return LoadState::kSuccess; } void CPDF_DIBSource::LoadPalette() {
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index 931fdc4..a3e44c5 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h
@@ -65,30 +65,30 @@ const CPDF_ColorSpace* GetColorSpace() const { return m_pColorSpace; } uint32_t GetMatteColor() const { return m_MatteColor; } - int StartLoadDIBSource(CPDF_Document* pDoc, - const CPDF_Stream* pStream, - bool bHasMask, - CPDF_Dictionary* pFormResources, - CPDF_Dictionary* pPageResources, - bool bStdCS = false, - uint32_t GroupFamily = 0, - bool bLoadMask = false); - int ContinueLoadDIBSource(IFX_PauseIndicator* pPause); + LoadState StartLoadDIBSource(CPDF_Document* pDoc, + const CPDF_Stream* pStream, + bool bHasMask, + CPDF_Dictionary* pFormResources, + CPDF_Dictionary* pPageResources, + bool bStdCS = false, + uint32_t GroupFamily = 0, + bool bLoadMask = false); + LoadState ContinueLoadDIBSource(IFX_PauseIndicator* pPause); RetainPtr<CPDF_DIBSource> DetachMask(); private: CPDF_DIBSource(); - int StartLoadMask(); - int StartLoadMaskDIB(); + LoadState StartLoadMask(); + LoadState StartLoadMaskDIB(); bool ContinueToLoadMask(); - int ContinueLoadMaskDIB(IFX_PauseIndicator* pPause); + LoadState ContinueLoadMaskDIB(IFX_PauseIndicator* pPause); bool LoadColorInfo(const CPDF_Dictionary* pFormResources, const CPDF_Dictionary* pPageResources); DIB_COMP_DATA* GetDecodeAndMaskArray(bool* bDefaultDecode, bool* bColorKey); RetainPtr<CFX_DIBitmap> LoadJpxBitmap(); void LoadPalette(); - int CreateDecoder(); + LoadState CreateDecoder(); bool CreateDCTDecoder(const uint8_t* src_data, uint32_t src_size, const CPDF_Dictionary* pParams);
diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.cpp b/core/fpdfapi/render/cpdf_imagecacheentry.cpp index f4be2af..f0b0c33 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.cpp +++ b/core/fpdfapi/render/cpdf_imagecacheentry.cpp
@@ -68,13 +68,14 @@ } m_pCurBitmap = pdfium::MakeRetain<CPDF_DIBSource>(); - int ret = m_pCurBitmap.As<CPDF_DIBSource>()->StartLoadDIBSource( - m_pDocument.Get(), m_pImage->GetStream(), true, pFormResources, - pPageResources, bStdCS, GroupFamily, bLoadMask); - if (ret == 2) + CPDF_DIBSource::LoadState ret = + m_pCurBitmap.As<CPDF_DIBSource>()->StartLoadDIBSource( + m_pDocument.Get(), m_pImage->GetStream(), true, pFormResources, + pPageResources, bStdCS, GroupFamily, bLoadMask); + if (ret == CPDF_DIBSource::LoadState::kContinue) return CPDF_DIBSource::LoadState::kContinue; - if (ret == 1) + if (ret == CPDF_DIBSource::LoadState::kSuccess) ContinueGetCachedBitmap(pRenderStatus); else m_pCurBitmap.Reset(); @@ -83,11 +84,12 @@ bool CPDF_ImageCacheEntry::Continue(IFX_PauseIndicator* pPause, CPDF_RenderStatus* pRenderStatus) { - int ret = m_pCurBitmap.As<CPDF_DIBSource>()->ContinueLoadDIBSource(pPause); - if (ret == 2) + CPDF_DIBSource::LoadState ret = + m_pCurBitmap.As<CPDF_DIBSource>()->ContinueLoadDIBSource(pPause); + if (ret == CPDF_DIBSource::LoadState::kContinue) return true; - if (ret == 1) + if (ret == CPDF_DIBSource::LoadState::kSuccess) ContinueGetCachedBitmap(pRenderStatus); else m_pCurBitmap.Reset();