From a860a3d596f3daeadfdca0cc2093bfca722fa3a3 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 13 Jul 2017 11:07:28 -0400 Subject: Remove unused CPDF_RenderOptions members MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove members from CPDF_RenderOptions which are set but never read. Change-Id: I9598478bbc63c94af1c4693907abf66503138eb5 Reviewed-on: https://pdfium-review.googlesource.com/7750 Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- core/fpdfapi/render/cpdf_renderoptions.cpp | 6 ------ core/fpdfapi/render/cpdf_renderoptions.h | 3 --- fpdfsdk/fpdfformfill.cpp | 1 - fpdfsdk/fpdfview.cpp | 1 - 4 files changed, 11 deletions(-) diff --git a/core/fpdfapi/render/cpdf_renderoptions.cpp b/core/fpdfapi/render/cpdf_renderoptions.cpp index 70a4cf9615..b452405c3d 100644 --- a/core/fpdfapi/render/cpdf_renderoptions.cpp +++ b/core/fpdfapi/render/cpdf_renderoptions.cpp @@ -9,10 +9,7 @@ CPDF_RenderOptions::CPDF_RenderOptions() : m_ColorMode(RENDER_COLOR_NORMAL), m_Flags(RENDER_CLEARTYPE), - m_Interpolation(0), - m_AddFlags(0), m_dwLimitCacheSize(1024 * 1024 * 100), - m_HalftoneLimit(-1), m_bDrawAnnots(false) {} CPDF_RenderOptions::CPDF_RenderOptions(const CPDF_RenderOptions& rhs) @@ -20,10 +17,7 @@ CPDF_RenderOptions::CPDF_RenderOptions(const CPDF_RenderOptions& rhs) m_BackColor(rhs.m_BackColor), m_ForeColor(rhs.m_ForeColor), m_Flags(rhs.m_Flags), - m_Interpolation(rhs.m_Interpolation), - m_AddFlags(rhs.m_AddFlags), m_dwLimitCacheSize(rhs.m_dwLimitCacheSize), - m_HalftoneLimit(rhs.m_HalftoneLimit), m_bDrawAnnots(rhs.m_bDrawAnnots), m_pOCContext(rhs.m_pOCContext) {} diff --git a/core/fpdfapi/render/cpdf_renderoptions.h b/core/fpdfapi/render/cpdf_renderoptions.h index ee26ccbb07..bdcae55ad3 100644 --- a/core/fpdfapi/render/cpdf_renderoptions.h +++ b/core/fpdfapi/render/cpdf_renderoptions.h @@ -46,10 +46,7 @@ class CPDF_RenderOptions { FX_COLORREF m_BackColor; FX_COLORREF m_ForeColor; uint32_t m_Flags; - int m_Interpolation; - uint32_t m_AddFlags; uint32_t m_dwLimitCacheSize; - int m_HalftoneLimit; bool m_bDrawAnnots; CFX_RetainPtr m_pOCContext; }; diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index 6f63f0e2fa..f2ae621098 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -131,7 +131,6 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, options.m_ForeColor = 0; options.m_BackColor = 0xffffff; } - options.m_AddFlags = flags >> 8; options.m_bDrawAnnots = flags & FPDF_ANNOT; #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 4d0845b616..48322a74dc 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -109,7 +109,6 @@ void RenderPageImpl(CPDF_PageRenderContext* pContext, const CPDF_OCContext::UsageType usage = (flags & FPDF_PRINTING) ? CPDF_OCContext::Print : CPDF_OCContext::View; - pContext->m_pOptions->m_AddFlags = flags >> 8; pContext->m_pOptions->m_pOCContext = pdfium::MakeRetain(pPage->m_pDocument.Get(), usage); -- cgit v1.2.3