From f55e72e0476e5f5699b887099f213982e207afd0 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 13 Jul 2017 14:53:28 -0400 Subject: Cleanup CPDF_RenderOptions colour members. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL removes the fore/back colours in favour of just using the colours inline and converts the m_ColorMode to an enum. Change-Id: I1796e200d5c470680126af8625d45fc3062a1042 Reviewed-on: https://pdfium-review.googlesource.com/7751 Reviewed-by: Henrique Nakashima Reviewed-by: Nicolás Peña Commit-Queue: dsinclair --- fpdfsdk/fpdfformfill.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/fpdfformfill.cpp') diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp index f2ae621098..24cd64efa1 100644 --- a/fpdfsdk/fpdfformfill.cpp +++ b/fpdfsdk/fpdfformfill.cpp @@ -126,11 +126,9 @@ void FFLCommon(FPDF_FORMHANDLE hHandle, options.m_Flags &= ~RENDER_CLEARTYPE; // Grayscale output - if (flags & FPDF_GRAYSCALE) { - options.m_ColorMode = RENDER_COLOR_GRAY; - options.m_ForeColor = 0; - options.m_BackColor = 0xffffff; - } + if (flags & FPDF_GRAYSCALE) + options.m_ColorMode = CPDF_RenderOptions::kGray; + options.m_bDrawAnnots = flags & FPDF_ANNOT; #ifdef PDF_ENABLE_XFA -- cgit v1.2.3