1 Fix Rawhide build (more recent poppler)
3 Lubomir Rintel <lkundrak@v3.sk>
6 Index: inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp
7 ===================================================================
8 --- inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (revision 22620)
9 +++ inkscape-svn/src/extension/internal/pdfinput/pdf-parser.cpp (working copy)
11 #define M_PI 3.14159265358979323846
14 +#include <glib/poppler-features.h>
15 +#if POPPLER_CHECK_VERSION(0,12,2)
21 //------------------------------------------------------------------------
23 //------------------------------------------------------------------------
25 blendingColorSpace = NULL;
26 isolated = knockout = gFalse;
27 if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
28 - blendingColorSpace = GfxColorSpace::parse(&obj5);
29 + blendingColorSpace = GfxColorSpace::parse(&obj5 PGFX);
32 if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
34 state->setFillPattern(NULL);
35 res->lookupColorSpace(args[0].getName(), &obj);
37 - colorSpace = GfxColorSpace::parse(&args[0]);
38 + colorSpace = GfxColorSpace::parse(&args[0] PGFX);
40 - colorSpace = GfxColorSpace::parse(&obj);
41 + colorSpace = GfxColorSpace::parse(&obj PGFX);
46 state->setStrokePattern(NULL);
47 res->lookupColorSpace(args[0].getName(), &obj);
49 - colorSpace = GfxColorSpace::parse(&args[0]);
50 + colorSpace = GfxColorSpace::parse(&args[0] PGFX);
52 - colorSpace = GfxColorSpace::parse(&obj);
53 + colorSpace = GfxColorSpace::parse(&obj PGFX);
58 builder->updateStyle(state);
60 if (args[numArgs-1].isName() &&
61 - (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
62 + (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
63 state->setFillPattern(pattern);
64 builder->updateStyle(state);
67 builder->updateStyle(state);
69 if (args[numArgs-1].isName() &&
70 - (pattern = res->lookupPattern(args[numArgs-1].getName()))) {
71 + (pattern = res->lookupPattern(args[numArgs-1].getName() PGFX))) {
72 state->setStrokePattern(pattern);
73 builder->updateStyle(state);
76 double *matrix = NULL;
77 GBool savedState = gFalse;
79 - if (!(shading = res->lookupShading(args[0].getName()))) {
80 + if (!(shading = res->lookupShading(args[0].getName() PGFX))) {
88 - colorSpace = GfxColorSpace::parse(&obj1);
89 + colorSpace = GfxColorSpace::parse(&obj1 PGFX);
90 } else if (csMode == streamCSDeviceGray) {
91 colorSpace = new GfxDeviceGrayColorSpace();
92 } else if (csMode == streamCSDeviceRGB) {
97 - maskColorSpace = GfxColorSpace::parse(&obj1);
98 + maskColorSpace = GfxColorSpace::parse(&obj1 PGFX);
100 if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
102 @@ -2767,7 +2774,7 @@
103 if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
105 if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
106 - blendingColorSpace = GfxColorSpace::parse(&obj3);
107 + blendingColorSpace = GfxColorSpace::parse(&obj3 PGFX);
110 if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {