Initialize CPDF_ImageRenderer in the header.
Also add a GetRenderOptions() helper method.
Change-Id: I47db7a21f55f396e08775575f6b2a48e440c2f91
Reviewed-on: https://pdfium-review.googlesource.com/42750
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index cd68322..59186b9 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -40,18 +40,9 @@
#include "core/fxge/skia/fx_skia_device.h"
#endif
-CPDF_ImageRenderer::CPDF_ImageRenderer()
- : m_pRenderStatus(nullptr),
- m_pImageObject(nullptr),
- m_Status(0),
- m_pObj2Device(nullptr),
- m_bPatternColor(false),
- m_pPattern(nullptr),
- m_bStdCS(false),
- m_BlendType(FXDIB_BLEND_NORMAL),
- m_Result(true) {}
+CPDF_ImageRenderer::CPDF_ImageRenderer() = default;
-CPDF_ImageRenderer::~CPDF_ImageRenderer() {}
+CPDF_ImageRenderer::~CPDF_ImageRenderer() = default;
bool CPDF_ImageRenderer::StartLoadDIBBase() {
CFX_FloatRect image_rect_f = m_ImageMatrix.GetUnitRect();
@@ -76,8 +67,7 @@
CPDF_GeneralState& state = m_pImageObject->m_GeneralState;
m_BitmapAlpha = FXSYS_round(255 * state.GetFillAlpha());
m_pDIBBase = m_Loader.GetBitmap();
- if (m_pRenderStatus->GetRenderOptions().ColorModeIs(
- CPDF_RenderOptions::kAlpha) &&
+ if (GetRenderOptions().ColorModeIs(CPDF_RenderOptions::kAlpha) &&
!m_Loader.GetMask()) {
return StartBitmapAlpha();
}
@@ -99,8 +89,7 @@
m_bPatternColor = true;
}
m_FillArgb = m_pRenderStatus->GetFillArgb(m_pImageObject.Get());
- } else if (m_pRenderStatus->GetRenderOptions().ColorModeIs(
- CPDF_RenderOptions::kGray)) {
+ } else if (GetRenderOptions().ColorModeIs(CPDF_RenderOptions::kGray)) {
RetainPtr<CFX_DIBitmap> pClone = m_pDIBBase->Clone(nullptr);
if (!pClone)
return false;
@@ -109,15 +98,15 @@
m_pDIBBase = pClone;
}
m_Flags = 0;
- if (m_pRenderStatus->GetRenderOptions().HasFlag(RENDER_FORCE_DOWNSAMPLE))
+ if (GetRenderOptions().HasFlag(RENDER_FORCE_DOWNSAMPLE))
m_Flags |= RENDER_FORCE_DOWNSAMPLE;
- else if (m_pRenderStatus->GetRenderOptions().HasFlag(RENDER_FORCE_HALFTONE))
+ else if (GetRenderOptions().HasFlag(RENDER_FORCE_HALFTONE))
m_Flags |= RENDER_FORCE_HALFTONE;
if (m_pRenderStatus->GetRenderDevice()->GetDeviceClass() != FXDC_DISPLAY)
HandleFilters();
- if (m_pRenderStatus->GetRenderOptions().HasFlag(RENDER_NOIMAGESMOOTH))
+ if (GetRenderOptions().HasFlag(RENDER_NOIMAGESMOOTH))
m_Flags |= FXDIB_NOSMOOTH;
else if (m_pImageObject->GetImage()->IsInterpol())
m_Flags |= FXDIB_INTERPOL;
@@ -171,9 +160,8 @@
m_BlendType = blendType;
m_pObj2Device = pObj2Device;
const CPDF_Dictionary* pOC = m_pImageObject->GetImage()->GetOC();
- if (pOC && m_pRenderStatus->GetRenderOptions().GetOCContext() &&
- !m_pRenderStatus->GetRenderOptions().GetOCContext()->CheckOCGVisible(
- pOC)) {
+ if (pOC && GetRenderOptions().GetOCContext() &&
+ !GetRenderOptions().GetOCContext()->CheckOCGVisible(pOC)) {
return false;
}
m_ImageMatrix = m_pImageObject->matrix();
@@ -262,6 +250,10 @@
}
}
+const CPDF_RenderOptions& CPDF_ImageRenderer::GetRenderOptions() const {
+ return m_pRenderStatus->GetRenderOptions();
+}
+
bool CPDF_ImageRenderer::DrawPatternImage(const CFX_Matrix* pObj2Device) {
if (NotDrawing()) {
m_Result = false;
@@ -281,7 +273,7 @@
CPDF_RenderStatus bitmap_render(m_pRenderStatus->GetContext(),
&bitmap_device1);
- bitmap_render.SetOptions(m_pRenderStatus->GetRenderOptions());
+ bitmap_render.SetOptions(GetRenderOptions());
bitmap_render.SetDropObjects(m_pRenderStatus->GetDropObjects());
bitmap_render.SetStdCS(true);
bitmap_render.Initialize(nullptr, nullptr);
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h
index c6ccb0c..c538d9f 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.h
+++ b/core/fpdfapi/render/cpdf_imagerenderer.h
@@ -21,6 +21,7 @@
class CPDF_ImageObject;
class CPDF_PageObject;
class CPDF_Pattern;
+class CPDF_RenderOptions;
class CPDF_RenderStatus;
class CPDF_ImageRenderer {
@@ -61,25 +62,26 @@
const RetainPtr<CFX_DIBBase>& pDIBBase,
CFX_Matrix* pNewMatrix,
const FX_RECT& rect) const;
+ const CPDF_RenderOptions& GetRenderOptions() const;
void HandleFilters();
UnownedPtr<CPDF_RenderStatus> m_pRenderStatus;
UnownedPtr<CPDF_ImageObject> m_pImageObject;
- int m_Status;
UnownedPtr<const CFX_Matrix> m_pObj2Device;
+ UnownedPtr<CPDF_Pattern> m_pPattern;
+ RetainPtr<CFX_DIBBase> m_pDIBBase;
CFX_Matrix m_ImageMatrix;
CPDF_ImageLoader m_Loader;
- RetainPtr<CFX_DIBBase> m_pDIBBase;
- int m_BitmapAlpha;
- bool m_bPatternColor;
- UnownedPtr<CPDF_Pattern> m_pPattern;
- FX_ARGB m_FillArgb;
- uint32_t m_Flags;
std::unique_ptr<CFX_ImageTransformer> m_pTransformer;
std::unique_ptr<CFX_ImageRenderer> m_DeviceHandle;
- bool m_bStdCS;
- int m_BlendType;
- bool m_Result;
+ int m_Status = 0;
+ int m_BitmapAlpha = 0;
+ int m_BlendType = FXDIB_BLEND_NORMAL;
+ FX_ARGB m_FillArgb = 0;
+ uint32_t m_Flags = 0;
+ bool m_bPatternColor = false;
+ bool m_bStdCS = false;
+ bool m_Result = true;
};
#endif // CORE_FPDFAPI_RENDER_CPDF_IMAGERENDERER_H_
