Attachment 36989 Details for Bug 2807 – Patch for CairoOutputDev

[patch] Patch for CairoOutputDev

poppler-cairo-text-render-modes.diff (text/plain), 2.43 KB, created by Carlos Garcia Campos on 2010-07-13 02:57:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2010-07-13 02:57:19 UTC

Size: 2.43 KB

patch

obsolete

>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
>index 65fac76..f832074 100644
>--- a/poppler/CairoOutputDev.cc
>+++ b/poppler/CairoOutputDev.cc
>@@ -606,15 +606,6 @@ void CairoOutputDev::updateFont(GfxState *state) {
>   cairo_set_font_matrix (cairo, &matrix);
> }
> 
>-void CairoOutputDev::updateRender(GfxState *state) {
>-  int rm;
>-  rm = state->getRender();
>-  if (rm == 7 && haveCSPattern) {
>-    haveCSPattern = gFalse;
>-    restoreState(state);
>-  }
>-}
>-
> void CairoOutputDev::doPath(cairo_t *cairo, GfxState *state, GfxPath *path) {
>   GfxSubpath *subpath;
>   int i, j;
>@@ -909,7 +900,7 @@ void CairoOutputDev::endString(GfxState *state)
>     return;
>   }
>   
>-  if (!(render & 1)) {
>+  if (!(render & 1) && !haveCSPattern) {
>     LOG (printf ("fill string\n"));
>     cairo_set_source (cairo, fill_pattern);
>     cairo_show_glyphs (cairo, glyphs, glyphCount);
>@@ -930,7 +921,7 @@ void CairoOutputDev::endString(GfxState *state)
>   }
> 
>   // clip
>-  if (render & 4) {
>+  if (haveCSPattern || (render & 4)) {
>     LOG (printf ("clip string\n"));
>     // append the glyph path to textClipPath.
> 
>@@ -1014,17 +1005,14 @@ void CairoOutputDev::type3D1(GfxState *state, double wx, double wy,
> }
> 
> void CairoOutputDev::beginTextObject(GfxState *state) {
>-  if (state->getFillColorSpace()->getMode() == csPattern) {
>+  if (!(state->getRender() & 4) && state->getFillColorSpace()->getMode() == csPattern) {
>     haveCSPattern = gTrue;
>     saveState(state);
>-    savedRender = state->getRender();
>-    state->setRender(7); // Set clip to text path
>   }
> }
> 
> void CairoOutputDev::endTextObject(GfxState *state) {
>   if (haveCSPattern) {
>-    state->setRender(savedRender);
>     haveCSPattern = gFalse;
>     if (state->getFillColorSpace()->getMode() != csPattern) {
>       if (textClipPath) {
>diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
>index 02a4955..e003d83 100644
>--- a/poppler/CairoOutputDev.h
>+++ b/poppler/CairoOutputDev.h
>@@ -150,7 +150,6 @@ public:
> 
>   //----- update text state
>   virtual void updateFont(GfxState *state);
>-  virtual void updateRender(GfxState *state);
> 
>   //----- path painting
>   virtual void stroke(GfxState *state);
>@@ -328,7 +327,6 @@ protected:
> 
>   GBool haveCSPattern;	// set if text has been drawn with a
>                         //   clipping render mode because of pattern colorspace
>-  int savedRender;	// use if pattern colorspace
> };
> 
> //------------------------------------------------------------------------

Actions: View | Splinter Review

Attachments on bug 2807: 2496 | 2730 | 36253 | 36512 | 36513 | 36528 | 36989 | 37347 | 37416 | 37504 | 38596 | 38797 | 38879 | 38894

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.