From 40482e6f06eac0c5089e44df2d62881127eeeb3e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 5 Mar 2018 15:03:37 +0000 Subject: Use CPDF_DIBSource::LoadState enum class in more places. Change-Id: Iaf124c1b1ceca86d220ae654d9d18af7475209b6 Reviewed-on: https://pdfium-review.googlesource.com/27870 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfapi/render/cpdf_dibsource.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'core/fpdfapi/render/cpdf_dibsource.h') diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index 931fdc4fc8..a3e44c57e7 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -65,30 +65,30 @@ class CPDF_DIBSource : public CFX_DIBSource { 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 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 LoadJpxBitmap(); void LoadPalette(); - int CreateDecoder(); + LoadState CreateDecoder(); bool CreateDCTDecoder(const uint8_t* src_data, uint32_t src_size, const CPDF_Dictionary* pParams); -- cgit v1.2.3