diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-04-25 21:10:05 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-25 21:10:05 +0000 |
| commit | 9ed6bd7150a9333cb28d149c98e3d316c3ededdf (patch) | |
| tree | d8b293aaec7be2acc7645150a194d9625a344758 /core/fxge/win32 | |
| parent | d7f3f1e1b99f1e10bfce83d779303c678965b57c (diff) | |
| download | pdfium-9ed6bd7150a9333cb28d149c98e3d316c3ededdf.tar.xz | |
Add PostScript PASSTHROUGH options to FPDF_SetPrintMode().
The existing PostScript modes write data into EMF comments. This
satisfies Chromium's use case, but other embedders want to write data
out via ExtEscape() in PASSTHROUGH mode.
BUG=pdfium:1068
Change-Id: I998035e99fbb84b16dcd244b750b476cecc3bd22
Reviewed-on: https://pdfium-review.googlesource.com/31299
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Diffstat (limited to 'core/fxge/win32')
| -rw-r--r-- | core/fxge/win32/cpsoutput.cpp | 13 | ||||
| -rw-r--r-- | core/fxge/win32/cpsoutput.h | 5 | ||||
| -rw-r--r-- | core/fxge/win32/fx_win32_print.cpp | 18 |
3 files changed, 27 insertions, 9 deletions
diff --git a/core/fxge/win32/cpsoutput.cpp b/core/fxge/win32/cpsoutput.cpp index 83f2fc09c6..5c734aa57a 100644 --- a/core/fxge/win32/cpsoutput.cpp +++ b/core/fxge/win32/cpsoutput.cpp @@ -10,7 +10,7 @@ #include "core/fxcrt/fx_system.h" -CPSOutput::CPSOutput(HDC hDC) : m_hDC(hDC) {} +CPSOutput::CPSOutput(HDC hDC, OutputMode mode) : m_hDC(hDC), m_mode(mode) {} CPSOutput::~CPSOutput() {} @@ -22,9 +22,14 @@ bool CPSOutput::WriteBlock(const void* str, size_t len) { *(reinterpret_cast<uint16_t*>(buffer)) = send_len; memcpy(buffer + 2, static_cast<const char*>(str) + sent_len, send_len); - // TODO(thestig/rbpotter): Do PASSTHROUGH for non-Chromium usage. - // ExtEscape(m_hDC, PASSTHROUGH, send_len + 2, buffer, 0, nullptr); - ::GdiComment(m_hDC, send_len + 2, reinterpret_cast<const BYTE*>(buffer)); + switch (m_mode) { + case OutputMode::kExtEscape: + ExtEscape(m_hDC, PASSTHROUGH, send_len + 2, buffer, 0, nullptr); + break; + case OutputMode::kGdiComment: + GdiComment(m_hDC, send_len + 2, reinterpret_cast<const BYTE*>(buffer)); + break; + } sent_len += send_len; len -= send_len; } diff --git a/core/fxge/win32/cpsoutput.h b/core/fxge/win32/cpsoutput.h index d140de95f4..49317a64a5 100644 --- a/core/fxge/win32/cpsoutput.h +++ b/core/fxge/win32/cpsoutput.h @@ -14,7 +14,9 @@ class CPSOutput : public IFX_WriteStream { public: - explicit CPSOutput(HDC hDC); + enum class OutputMode { kExtEscape, kGdiComment }; + + CPSOutput(HDC hDC, OutputMode mode); ~CPSOutput() override; // IFX_Writestream @@ -23,6 +25,7 @@ class CPSOutput : public IFX_WriteStream { private: HDC m_hDC; + const OutputMode m_mode; }; #endif // CORE_FXGE_WIN32_CPSOUTPUT_H_ diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index da40b8a762..f36fa84364 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -334,8 +334,18 @@ CPSPrinterDriver::CPSPrinterDriver(HDC hDC, : m_hDC(hDC), m_bCmykOutput(bCmykOutput) { // |mode| should be PostScript. ASSERT(mode == WindowsPrintMode::kModePostScript2 || - mode == WindowsPrintMode::kModePostScript3); - int pslevel = mode == WindowsPrintMode::kModePostScript2 ? 2 : 3; + mode == WindowsPrintMode::kModePostScript3 || + mode == WindowsPrintMode::kModePostScript2PassThrough || + mode == WindowsPrintMode::kModePostScript3PassThrough); + int pslevel = (mode == WindowsPrintMode::kModePostScript2 || + mode == WindowsPrintMode::kModePostScript2PassThrough) + ? 2 + : 3; + CPSOutput::OutputMode output_mode = + (mode == WindowsPrintMode::kModePostScript2 || + mode == WindowsPrintMode::kModePostScript3) + ? CPSOutput::OutputMode::kGdiComment + : CPSOutput::OutputMode::kExtEscape; m_HorzSize = ::GetDeviceCaps(m_hDC, HORZSIZE); m_VertSize = ::GetDeviceCaps(m_hDC, VERTSIZE); @@ -343,8 +353,8 @@ CPSPrinterDriver::CPSPrinterDriver(HDC hDC, m_Height = ::GetDeviceCaps(m_hDC, VERTRES); m_nBitsPerPixel = ::GetDeviceCaps(m_hDC, BITSPIXEL); - m_PSRenderer.Init(pdfium::MakeRetain<CPSOutput>(m_hDC), pslevel, m_Width, - m_Height, bCmykOutput); + m_PSRenderer.Init(pdfium::MakeRetain<CPSOutput>(m_hDC, output_mode), pslevel, + m_Width, m_Height, bCmykOutput); HRGN hRgn = ::CreateRectRgn(0, 0, 1, 1); int ret = ::GetClipRgn(hDC, hRgn); if (ret == 1) { |