Attachment 135774 Details for Bug 103956 – Patch that fixes 'ArthurOutputDev::clip'

[patch] Patch that fixes 'ArthurOutputDev::clip'

0001-Arthur-clip-should-intersect-new-and-old-clipping-pa.patch (text/plain), 2.01 KB, created by oliver.sander on 2017-11-28 15:57:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oliver.sander

Created: 2017-11-28 15:57:15 UTC

Size: 2.01 KB

patch

obsolete

>From d1ccebc2c5ab7fc6a424b7951b07d8280f89f2e2 Mon Sep 17 00:00:00 2001
>From: Oliver Sander <oliver.sander@tu-dresden.de>
>Date: Tue, 28 Nov 2017 16:40:40 +0100
>Subject: [PATCH 1/6] Arthur: 'clip' should intersect new and old clipping path
>
>Previously, the 'clip' method of the ArthurOutputDev class
>replaced the current clipping path with the one given in
>the GfxState variable.  However, the expected behavior is
>to intersect the new path with the old one, and use the
>result as the new clipping path.
>---
> poppler/OutputDev.h        | 6 ++++++
> qt5/src/ArthurOutputDev.cc | 4 ++--
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
>index 107c94d2..c794526c 100644
>--- a/poppler/OutputDev.h
>+++ b/poppler/OutputDev.h
>@@ -240,7 +240,13 @@ public:
>     { return gFalse; }
> 
>   //----- path clipping
>+
>+  // Update the clipping path.  The new path is the intersection of the old path
>+  // with the path given in 'state'.
>   virtual void clip(GfxState * /*state*/) {}
>+
>+  // Update the clipping path.  The new path is the intersection of the old path
>+  // with the path given in 'state'.
>   virtual void eoClip(GfxState * /*state*/) {}
>   virtual void clipToStrokePath(GfxState * /*state*/) {}
> 
>diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
>index 0ec029f2..8053396f 100644
>--- a/qt5/src/ArthurOutputDev.cc
>+++ b/qt5/src/ArthurOutputDev.cc
>@@ -635,12 +635,12 @@ void ArthurOutputDev::eoFill(GfxState *state)
> 
> void ArthurOutputDev::clip(GfxState *state)
> {
>-  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::WindingFill ) );
>+  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::WindingFill ), Qt::IntersectClip );
> }
> 
> void ArthurOutputDev::eoClip(GfxState *state)
> {
>-  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::OddEvenFill ) );
>+  m_painter->setClipPath(convertPath( state, state->getPath(), Qt::OddEvenFill ), Qt::IntersectClip );
> }
> 
> void ArthurOutputDev::drawChar(GfxState *state, double x, double y,
>-- 
>2.15.0
>

Actions: View | Splinter Review

Attachments on bug 103956: 135773 | 135774

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.