summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2012-06-13 10:53:56 +0200
committerCarlos Garcia Campos <cgarcia@igalia.com>2012-06-15 10:09:42 +0200
commita2ec1528d84f12eeb64673fa07de2f784f9ed67d (patch)
tree52b4a0976053d0d27c702fe37fe672de6e6a16a2
parent95e50ef4f77454800c090b9f317d1599f89a91aa (diff)
Copy the path when copying the GfxState in InfoOutputDev::updateFont for poppler
That relies on a xpdf patch, for poppler we need to copy the path.
-rw-r--r--lib/pdf/InfoOutputDev.cc2
-rw-r--r--lib/pdf/popplercompat.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index d1d9ee52..76d5b27e 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -569,7 +569,7 @@ void InfoOutputDev::updateFont(GfxState *state)
current_splash_font = 0;
return;
}
- GfxState* state2 = state->copy();
+ GfxState* state2 = state->copy(POPPLER_COPY_STATE_PATH);
state2->setPath(0);
state2->setCTM(1.0,0,0,1.0,0,0);
splash->updateCTM(state2, 0,0,0,0,0,0);
diff --git a/lib/pdf/popplercompat.h b/lib/pdf/popplercompat.h
index 06c6e5ef..97277334 100644
--- a/lib/pdf/popplercompat.h
+++ b/lib/pdf/popplercompat.h
@@ -92,6 +92,12 @@ char* mktmpname(char*ptr);
#endif
#ifdef HAVE_POPPLER
+ #define POPPLER_COPY_STATE_PATH gTrue
+#else
+ #define POPPLER_COPY_STATE_PATH gFalse
+#endif
+
+#ifdef HAVE_POPPLER
#define GFXGlobalParams GlobalParams
#endif