diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-07-13 14:53:28 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-13 19:34:45 +0000 |
| commit | f55e72e0476e5f5699b887099f213982e207afd0 (patch) | |
| tree | 5108b56962094fb7588f4f860fc3bb9c9f00e3c3 /fpdfsdk | |
| parent | 7f55a5410f665cfdbb5796d6d9a5387a5f6fa2eb (diff) | |
| download | pdfium-f55e72e0476e5f5699b887099f213982e207afd0.tar.xz | |
Cleanup CPDF_RenderOptions colour members.
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 <hnakashima@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfformfill.cpp | 8 | ||||
| -rw-r--r-- | fpdfsdk/fpdfview.cpp | 7 | ||||
| -rw-r--r-- | fpdfsdk/fxedit/fxet_edit.cpp | 4 |
3 files changed, 7 insertions, 12 deletions
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 diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 48322a74dc..905d3683a0 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -101,11 +101,8 @@ void RenderPageImpl(CPDF_PageRenderContext* pContext, #endif // PDF_ENABLE_XFA // Grayscale output - if (flags & FPDF_GRAYSCALE) { - pContext->m_pOptions->m_ColorMode = RENDER_COLOR_GRAY; - pContext->m_pOptions->m_ForeColor = 0; - pContext->m_pOptions->m_BackColor = 0xffffff; - } + if (flags & FPDF_GRAYSCALE) + pContext->m_pOptions->m_ColorMode = CPDF_RenderOptions::kGray; const CPDF_OCContext::UsageType usage = (flags & FPDF_PRINTING) ? CPDF_OCContext::Print : CPDF_OCContext::View; diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp index 82f82477d8..cf382f8426 100644 --- a/fpdfsdk/fxedit/fxet_edit.cpp +++ b/fpdfsdk/fxedit/fxet_edit.cpp @@ -76,14 +76,14 @@ void DrawTextString(CFX_RenderDevice* pDevice, CPDF_RenderOptions ro; ro.m_Flags = RENDER_CLEARTYPE; - ro.m_ColorMode = RENDER_COLOR_NORMAL; + ro.m_ColorMode = CPDF_RenderOptions::kNormal; CPDF_TextRenderer::DrawTextString(pDevice, pos.x, pos.y, pFont, fFontSize, &mt, str, crTextFill, nullptr, &ro); } else { CPDF_RenderOptions ro; ro.m_Flags = RENDER_CLEARTYPE; - ro.m_ColorMode = RENDER_COLOR_NORMAL; + ro.m_ColorMode = CPDF_RenderOptions::kNormal; CPDF_TextRenderer::DrawTextString(pDevice, pos.x, pos.y, pFont, fFontSize, pUser2Device, str, crTextFill, nullptr, |