diff options
-rwxr-xr-x | graphics/inkscape/DETAILS | 4 | ||||
-rw-r--r-- | graphics/inkscape/HISTORY | 6 | ||||
-rwxr-xr-x | graphics/inkscape/PRE_BUILD | 5 | ||||
-rw-r--r-- | graphics/inkscape/patches/inkscape-0.92.4-upstream_fixes-1.patch | 96 | ||||
-rw-r--r-- | graphics/inkscape/poppler_new_object_api.patch | 1391 |
5 files changed, 108 insertions, 1394 deletions
diff --git a/graphics/inkscape/DETAILS b/graphics/inkscape/DETAILS index 2ec0b1551a..5514880675 100755 --- a/graphics/inkscape/DETAILS +++ b/graphics/inkscape/DETAILS @@ -1,10 +1,10 @@ SPELL=inkscape - VERSION=0.92.3 + VERSION=0.92.4 SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=https://inkscape.global.ssl.fastly.net/media/resources/file/$SOURCE # SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE} - SOURCE_HASH=sha512:af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 + SOURCE_HASH=sha512:b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120 WEB_SITE=http://www.inkscape.org/ ENTERED=20031207 SECURITY_PATCH=2 diff --git a/graphics/inkscape/HISTORY b/graphics/inkscape/HISTORY index 8f229387ca..debbfea732 100644 --- a/graphics/inkscape/HISTORY +++ b/graphics/inkscape/HISTORY @@ -1,3 +1,9 @@ +2019-10-01 Thomas Orgis <sobukus@sourcemage.org> + * DETAILS: version 0.92.4 + * PRE_BUILD: new patchery, poppler fix (via Linux From Scratch) + * patches/inkscape-0.92.4-upstream_fixes-1.patch: upstream + bug fixes (via Linux From Scratch) + 2018-12-12 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: version 0.92.3 diff --git a/graphics/inkscape/PRE_BUILD b/graphics/inkscape/PRE_BUILD index 3bcaaf36b5..9c7ea467ca 100755 --- a/graphics/inkscape/PRE_BUILD +++ b/graphics/inkscape/PRE_BUILD @@ -2,5 +2,8 @@ # We need to switch the spell to cmake some time. default_pre_build && cd "$SOURCE_DIRECTORY" && -patch -Np1 < "$SCRIPT_DIRECTORY/poppler_new_object_api.patch" +# Fix for poppler since 0.76. +sed -e 's|new Lexer(xref, obj)|obj|g' -i \ + src/extension/internal/pdfinput/pdf-parser.cpp && +apply_patch_dir patches && ./autogen.sh diff --git a/graphics/inkscape/patches/inkscape-0.92.4-upstream_fixes-1.patch b/graphics/inkscape/patches/inkscape-0.92.4-upstream_fixes-1.patch new file mode 100644 index 0000000000..81aaa24207 --- /dev/null +++ b/graphics/inkscape/patches/inkscape-0.92.4-upstream_fixes-1.patch @@ -0,0 +1,96 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2019-06-25 +Initial Package Version: 0.92.4 +Upstream Status: Applied +Origin: Upstream +Description: Fixes for out of bounds accesses in the fill bucket and text tools. +These issues are highlighted if -D_FORTIFY_SOURCE=2 is used (e.g. application +terminated when trying to use the fill tool). + +commit 19225039b8667679c175e62f1faa29495b4ed547 +Author: Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> +Date: Fri Apr 26 00:30:04 2019 +1000 + + Add out of bound checks to fill bucket + + Fixes https://gitlab.com/inkscape/inbox/issues/398 + +commit 37a5a0e7f1e0303222e6349379a6943c60f3b5b8 +Author: Trevor Spiteri <trevor.spiteri@um.edu.mt> +Date: Tue Jan 15 18:57:17 2019 +0100 + + out-of-bounds access on Enter in new text field + + https://bugzilla.redhat.com/show_bug.cgi?id=1575842 + + Reproduce using: + 1. Select text tool (F8) + 2. Click on empty canvas + 3. Hit Enter + +commit 6b8b86ca248cc47128ee3646d7ce17d2c0720522 +Author: Trevor Spiteri <trevor.spiteri@um.edu.mt> +Date: Tue Jan 15 18:57:56 2019 +0100 + + out-of-bounds access on clicking at end of text field + + https://bugzilla.redhat.com/show_bug.cgi?id=1608371 + https://bugs.launchpad.net/inkscape/+bug/1803553 + + Reproduce using: + 1. Select text tool (F8) + 2. Click on empty canvas + 3. Type "abc" + 4. Click somewhere else + 5. Click in first text field after "c" in "abc" + +diff -Naur a/src/libnrtype/Layout-TNG-OutIter.cpp b/src/libnrtype/Layout-TNG-OutIter.cpp +--- a/src/libnrtype/Layout-TNG-OutIter.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/libnrtype/Layout-TNG-OutIter.cpp 2019-06-25 18:55:33.680796467 +0100 +@@ -46,7 +46,10 @@ + best_x_difference = this_x_difference; + } + } +- if (best_char_index == -1) return iterator(this, char_index); ++ if (best_char_index == -1) ++ best_char_index = char_index; ++ if (best_char_index == _characters.size()) ++ return end(); + return iterator(this, best_char_index); + } + +@@ -182,6 +185,8 @@ + if (_input_stream[source_index]->Type() != TEXT_SOURCE) + return iterator(this, char_index); + ++ if (char_index >= _characters.size()) ++ return end(); + return iterator(this, char_index); + /* This code was never used, the text_iterator argument was "NULL" in all calling code + InputStreamTextSource const *text_source = static_cast<InputStreamTextSource const *>(_input_stream[source_index]); +diff -Naur a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp +--- a/src/ui/tools/flood-tool.cpp 2019-01-15 04:29:27.000000000 +0000 ++++ b/src/ui/tools/flood-tool.cpp 2019-06-25 18:55:14.064888807 +0100 +@@ -630,7 +630,7 @@ + bool can_paint_top = (top_ty > 0); + bool can_paint_bottom = (bottom_ty < bci.height); + +- Geom::Point t = fill_queue->front(); ++ Geom::Point front_of_queue = fill_queue->empty() ? Geom::Point() : fill_queue->front(); + + do { + ok = false; +@@ -648,8 +648,11 @@ + paint_directions = paint_pixel(px, trace_px, orig_color, bci, current_trace_t); + if (bci.radius == 0) { + mark_pixel_checked(current_trace_t); +- if ((t[Geom::X] == bci.x) && (t[Geom::Y] == bci.y)) { +- fill_queue->pop_front(); t = fill_queue->front(); ++ if ((!fill_queue->empty()) && ++ (front_of_queue[Geom::X] == bci.x) && ++ (front_of_queue[Geom::Y] == bci.y)) { ++ fill_queue->pop_front(); ++ front_of_queue = fill_queue->empty() ? Geom::Point() : fill_queue->front(); + } + } + diff --git a/graphics/inkscape/poppler_new_object_api.patch b/graphics/inkscape/poppler_new_object_api.patch deleted file mode 100644 index cbd9f90de7..0000000000 --- a/graphics/inkscape/poppler_new_object_api.patch +++ /dev/null @@ -1,1391 +0,0 @@ -From 93ccf03162cd2e46d962822d5507865f3451168c Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Wed, 6 Sep 2017 15:05:31 +0200 -Subject: [PATCH] adapt to poppler 0.58 - ---- - CMakeScripts/DefineDependsandFlags.cmake | 4 ++++ - config.h.cmake | 3 +++ - src/extension/internal/pdfinput/pdf-input.cpp | 6 ++++++ - src/extension/internal/pdfinput/pdf-parser.cpp | 521 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 534 insertions(+) - -diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake -index 836cfd9..c33a3bf 100644 ---- a/CMakeScripts/DefineDependsandFlags.cmake -+++ b/CMakeScripts/DefineDependsandFlags.cmake -@@ -124,6 +124,10 @@ if(ENABLE_POPPLER) - POPPLER_VERSION VERSION_EQUAL "0.29.0") - set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) - endif() -+ if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR -+ POPPLER_VERSION VERSION_EQUAL "0.58.0") -+ set(POPPLER_NEW_OBJECT_API ON) -+ endif() - else() - set(ENABLE_POPPLER_CAIRO OFF) - endif() -diff --git a/config.h.cmake b/config.h.cmake -index 00d6fb8..7af7da8 100644 ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -149,6 +149,9 @@ - /* Use color space API from Poppler >= 0.29.0 */ - #cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 - -+/* Use object API from Poppler >= 0.58.0 */ -+#cmakedefine POPPLER_NEW_OBJECT_API 1 -+ - /* Define to 1 if you have the `pow' function. */ - #cmakedefine HAVE_POW 1 - -diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp -index c1940b1..e311562 100644 ---- a/src/extension/internal/pdfinput/pdf-input.cpp -+++ b/src/extension/internal/pdfinput/pdf-input.cpp -@@ -840,14 +840,20 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { - } - - // Parse the document structure -+#if defined(POPPLER_NEW_OBJECT_API) -+ Object obj = page->getContents(); -+#else - Object obj; - page->getContents(&obj); -+#endif - if (!obj.isNull()) { - pdf_parser->parse(&obj); - } - - // Cleanup -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - delete pdf_parser; - delete builder; - g_free(docname); -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index 5ede59b..604b7f8 100644 ---- a/src/extension/internal/pdfinput/pdf-parser.cpp -+++ b/src/extension/internal/pdfinput/pdf-parser.cpp -@@ -414,13 +414,21 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - - if (obj->isArray()) { - for (int i = 0; i < obj->arrayGetLength(); ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj->arrayGet(i); -+#else - obj->arrayGet(i, &obj2); -+#endif - if (!obj2.isStream()) { - error(errInternal, -1, "Weird page contents"); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - return; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } else if (!obj->isStream()) { - error(errInternal, -1, "Weird page contents"); -@@ -439,7 +447,11 @@ void PdfParser::go(GBool /*topLevel*/) - - // scan a sequence of objects - int numArgs = 0; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = parser->getObj(); -+#else - parser->getObj(&obj); -+#endif - while (!obj.isEOF()) { - - // got a command - execute it -@@ -457,14 +469,20 @@ void PdfParser::go(GBool /*topLevel*/) - // Run the operation - execOp(&obj, args, numArgs); - -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); - for (int i = 0; i < numArgs; ++i) - args[i].free(); -+#endif - numArgs = 0; - - // got an argument - save it - } else if (numArgs < maxArgs) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ args[numArgs++] = std::move(obj); -+#else - args[numArgs++] = obj; -+#endif - - // too many arguments - something is wrong - } else { -@@ -475,13 +493,21 @@ void PdfParser::go(GBool /*topLevel*/) - printf("\n"); - fflush(stdout); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - } - - // grab the next object -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = parser->getObj(); -+#else - parser->getObj(&obj); -+#endif - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - - // args at end with no command - if (numArgs > 0) { -@@ -495,8 +521,10 @@ void PdfParser::go(GBool /*topLevel*/) - printf("\n"); - fflush(stdout); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - for (int i = 0; i < numArgs; ++i) - args[i].free(); -+#endif - } - } - -@@ -692,9 +720,13 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/) - if (length != 0) { - dash = (double *)gmallocn(length, sizeof(double)); - for (int i = 0; i < length; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ dash[i] = a->get(i).getNum(); -+#else - Object obj; - dash[i] = a->get(i, &obj)->getNum(); - obj.free(); -+#endif - } - } - state->setLineDash(dash, length, args[1].getNum()); -@@ -744,12 +776,18 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - GBool haveBackdropColor = gFalse; - GBool alpha = gFalse; - -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj1 = res->lookupGState(args[0].getName())).isNull()) { -+#else - if (!res->lookupGState(args[0].getName(), &obj1)) { -+#endif - return; - } - if (!obj1.isDict()) { - error(errSyntaxError, getPos(), "ExtGState '{0:s}' is wrong type"), args[0].getName(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - return; - } - if (printCommands) { -@@ -759,7 +797,11 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } - - // transparency support: blend mode, fill/stroke opacity -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj2 = obj1.dictLookup(const_cast<char*>("BM"))).isNull())) { -+#else - if (!obj1.dictLookup(const_cast<char*>("BM"), &obj2)->isNull()) { -+#endif - GfxBlendMode mode = gfxBlendNormal; - if (state->parseBlendMode(&obj2, &mode)) { - state->setBlendMode(mode); -@@ -767,40 +809,71 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState"); - } - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast<char*>("ca"))).isNum()) { -+#else - obj2.free(); - if (obj1.dictLookup(const_cast<char*>("ca"), &obj2)->isNum()) { -+#endif - state->setFillOpacity(obj2.getNum()); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast<char*>("CA"))).isNum()) { -+#else - obj2.free(); - if (obj1.dictLookup(const_cast<char*>("CA"), &obj2)->isNum()) { -+#endif - state->setStrokeOpacity(obj2.getNum()); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // fill/stroke overprint - GBool haveFillOP = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((haveFillOP = (obj2 = obj1.dictLookup(const_cast<char*>("op"))).isBool())) { -+#else - if ((haveFillOP = (obj1.dictLookup(const_cast<char*>("op"), &obj2)->isBool()))) { -+#endif - state->setFillOverprint(obj2.getBool()); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast<char*>("OP"))).isBool()) { -+#else - obj2.free(); - if (obj1.dictLookup(const_cast<char*>("OP"), &obj2)->isBool()) { -+#endif - state->setStrokeOverprint(obj2.getBool()); - if (!haveFillOP) { - state->setFillOverprint(obj2.getBool()); - } - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // stroke adjust -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast<char*>("SA"))).isBool()) { -+#else - if (obj1.dictLookup(const_cast<char*>("SA"), &obj2)->isBool()) { -+#endif - state->setStrokeAdjust(obj2.getBool()); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // transfer function -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj2 = obj1.dictLookup(const_cast<char*>("TR2"))).isNull()) { -+ obj2 = obj1.dictLookup(const_cast<char*>("TR")); -+#else - if (obj1.dictLookup(const_cast<char*>("TR2"), &obj2)->isNull()) { - obj2.free(); - obj1.dictLookup(const_cast<char*>("TR"), &obj2); -+#endif - } - if (obj2.isName(const_cast<char*>("Default")) || - obj2.isName(const_cast<char*>("Identity"))) { -@@ -809,9 +882,15 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } else if (obj2.isArray() && obj2.arrayGetLength() == 4) { - int pos = 4; - for (int i = 0; i < 4; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj3 = obj2.arrayGet(i); -+#else - obj2.arrayGet(i, &obj3); -+#endif - funcs[i] = Function::parse(&obj3); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj3.free(); -+#endif - if (!funcs[i]) { - pos = i; - break; -@@ -828,21 +907,37 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } else if (!obj2.isNull()) { - error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - - // soft mask -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj2 = obj1.dictLookup(const_cast<char*>("SMask"))).isNull())) { -+#else - if (!obj1.dictLookup(const_cast<char*>("SMask"), &obj2)->isNull()) { -+#endif - if (obj2.isName(const_cast<char*>("None"))) { - builder->clearSoftMask(state); - } else if (obj2.isDict()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj2.dictLookup(const_cast<char*>("S"))).isName(const_cast<char*>("Alpha"))) { -+#else - if (obj2.dictLookup(const_cast<char*>("S"), &obj3)->isName(const_cast<char*>("Alpha"))) { -+#endif - alpha = gTrue; - } else { // "Luminosity" - alpha = gFalse; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj3.free(); -+#endif - funcs[0] = NULL; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj3 = obj2.dictLookup(const_cast<char*>("TR"))).isNull())) { -+#else - if (!obj2.dictLookup(const_cast<char*>("TR"), &obj3)->isNull()) { -+#endif - funcs[0] = Function::parse(&obj3); - if (funcs[0]->getInputSize() != 1 || - funcs[0]->getOutputSize() != 1) { -@@ -851,26 +946,45 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - funcs[0] = NULL; - } - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((haveBackdropColor = (obj3 = obj2.dictLookup(const_cast<char*>("BC"))).isArray())) { -+#else - obj3.free(); - if ((haveBackdropColor = obj2.dictLookup(const_cast<char*>("BC"), &obj3)->isArray())) { -+#endif - for (int i = 0; i < gfxColorMaxComps; ++i) { - backdropColor.c[i] = 0; - } - for (int i = 0; i < obj3.arrayGetLength() && i < gfxColorMaxComps; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj4 = obj3.arrayGet(i); -+#else - obj3.arrayGet(i, &obj4); -+#endif - if (obj4.isNum()) { - backdropColor.c[i] = dblToCol(obj4.getNum()); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj4.free(); -+#endif - } - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj2.dictLookup(const_cast<char*>("G"))).isStream()) { -+ if ((obj4 = obj3.streamGetDict()->lookup(const_cast<char*>("Group"))).isDict()) { -+#else - obj3.free(); - if (obj2.dictLookup(const_cast<char*>("G"), &obj3)->isStream()) { - if (obj3.streamGetDict()->lookup(const_cast<char*>("Group"), &obj4)->isDict()) { -+#endif - GfxColorSpace *blendingColorSpace = 0; - GBool isolated = gFalse; - GBool knockout = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj5 = obj4.dictLookup(const_cast<char*>("CS"))).isNull())) { -+#else - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { -+#endif - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); - #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -@@ -879,15 +993,25 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); - #endif - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj5 = obj4.dictLookup(const_cast<char*>("I"))).isBool()) { -+#else - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { -+#endif - isolated = obj5.getBool(); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj5 = obj4.dictLookup(const_cast<char*>("K"))).isBool()) { -+#else - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("K"), &obj5)->isBool()) { -+#endif - knockout = obj5.getBool(); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj5.free(); -+#endif - if (!haveBackdropColor) { - if (blendingColorSpace) { - blendingColorSpace->getDefaultColor(&backdropColor); -@@ -906,18 +1030,24 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/) - } else { - error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj4.free(); -+#endif - } else { - error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj3.free(); -+#endif - } else if (!obj2.isNull()) { - error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState"); - } - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); - - obj1.free(); -+#endif - } - - void PdfParser::doSoftMask(Object *str, GBool alpha, -@@ -938,43 +1068,79 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, - dict = str->streamGetDict(); - - // check form type -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("FormType")); -+#else - dict->lookup(const_cast<char*>("FormType"), &obj1); -+#endif - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { - error(errSyntaxError, getPos(), "Unknown form type"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // get bounding box -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("BBox")); -+#else - dict->lookup(const_cast<char*>("BBox"), &obj1); -+#endif - if (!obj1.isArray()) { -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - error(errSyntaxError, getPos(), "Bad form bounding box"); - return; - } - for (i = 0; i < 4; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(i); -+#else - obj1.arrayGet(i, &obj2); -+#endif - bbox[i] = obj2.getNum(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ } -+#else - obj2.free(); - } - obj1.free(); -+#endif - - // get matrix -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("Matrix")); -+#else - dict->lookup(const_cast<char*>("Matrix"), &obj1); -+#endif - if (obj1.isArray()) { - for (i = 0; i < 6; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(i); -+#else - obj1.arrayGet(i, &obj2); -+#endif - m[i] = obj2.getNum(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } else { - m[0] = 1; m[1] = 0; - m[2] = 0; m[3] = 1; - m[4] = 0; m[5] = 0; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // get resources -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("Resources")); -+#else - dict->lookup(const_cast<char*>("Resources"), &obj1); -+#endif - resDict = obj1.isDict() ? obj1.getDict() : (Dict *)NULL; - - // draw it -@@ -987,7 +1153,9 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, - if (blendingColorSpace) { - delete blendingColorSpace; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - - void PdfParser::opSetRenderingIntent(Object /*args*/[], int /*numArgs*/) -@@ -1084,7 +1252,11 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/) - Object obj; - - state->setFillPattern(NULL); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = res->lookupColorSpace(args[0].getName()); -+#else - res->lookupColorSpace(args[0].getName(), &obj); -+#endif - - GfxColorSpace *colorSpace = 0; - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -@@ -1106,7 +1278,9 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/) - colorSpace = GfxColorSpace::parse(&obj, NULL); - } - #endif -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - if (colorSpace) { - GfxColor color; - state->setFillColorSpace(colorSpace); -@@ -1125,7 +1299,11 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/) - GfxColorSpace *colorSpace = 0; - - state->setStrokePattern(NULL); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = res->lookupColorSpace(args[0].getName()); -+#else - res->lookupColorSpace(args[0].getName(), &obj); -+#endif - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); -@@ -1145,7 +1323,9 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/) - colorSpace = GfxColorSpace::parse(&obj, NULL); - } - #endif -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - if (colorSpace) { - GfxColor color; - state->setStrokeColorSpace(colorSpace); -@@ -2375,7 +2555,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) - wMode = state->getFont()->getWMode(); - a = args[0].getArray(); - for (int i = 0; i < a->getLength(); ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = a->get(i); -+#else - a->get(i, &obj); -+#endif - if (obj.isNum()) { - // this uses the absolute value of the font size to match - // Acrobat's behavior -@@ -2392,7 +2576,9 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/) - } else { - error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - } - } - -@@ -2465,7 +2651,11 @@ void PdfParser::doShowText(GooString *s) { - //out->updateCTM(state, 1, 0, 0, 1, 0, 0); - if (0){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy, - code, u, uLen)) {*/ -+#if defined(POPPLER_NEW_OBJECT_API) -+ charProc = ((Gfx8BitFont *)font)->getCharProc(code); -+#else - ((Gfx8BitFont *)font)->getCharProc(code, &charProc); -+#endif - if ((resDict = ((Gfx8BitFont *)font)->getResources())) { - pushResources(resDict); - } -@@ -2478,7 +2668,9 @@ void PdfParser::doShowText(GooString *s) { - if (resDict) { - popResources(); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - charProc.free(); -+#endif - } - restoreState(); - // GfxState::restore() does *not* restore the current position, -@@ -2541,23 +2733,43 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/) - Object obj1, obj2, obj3, refObj; - - char *name = args[0].getName(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj1 = res->lookupXObject(name)).isNull()) { -+#else - if (!res->lookupXObject(name, &obj1)) { -+#endif - return; - } - if (!obj1.isStream()) { - error(errSyntaxError, getPos(), "XObject '{0:s}' is wrong type", name); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - return; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.streamGetDict()->lookup(const_cast<char*>("Subtype")); -+#else - obj1.streamGetDict()->lookup(const_cast<char*>("Subtype"), &obj2); -+#endif - if (obj2.isName(const_cast<char*>("Image"))) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ refObj = res->lookupXObjectNF(name); -+#else - res->lookupXObjectNF(name, &refObj); -+#endif - doImage(&refObj, obj1.getStream(), gFalse); -+#if !defined(POPPLER_NEW_OBJECT_API) - refObj.free(); -+#endif - } else if (obj2.isName(const_cast<char*>("Form"))) { - doForm(&obj1); - } else if (obj2.isName(const_cast<char*>("PS"))) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj3 = obj1.streamGetDict()->lookup(const_cast<char*>("Level1")); -+#else - obj1.streamGetDict()->lookup(const_cast<char*>("Level1"), &obj3); -+#endif - /* out->psXObject(obj1.getStream(), - obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ - } else if (obj2.isName()) { -@@ -2565,8 +2777,10 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/) - } else { - error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); - obj1.free(); -+#endif - } - - void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) -@@ -2593,10 +2807,18 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - dict = str->getDict(); - - // get size -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("Width")); -+#else - dict->lookup(const_cast<char*>("Width"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("W")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("W"), &obj1); -+#endif - } - if (obj1.isInt()){ - width = obj1.getInt(); -@@ -2607,11 +2829,19 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - else { - goto err2; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("Height")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("Height"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("H")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("H"), &obj1); -+#endif - } - if (obj1.isInt()) { - height = obj1.getInt(); -@@ -2622,26 +2852,46 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - else { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // image interpolation -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup("Interpolate"); -+#else - dict->lookup("Interpolate", &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup("I"); -+#else - obj1.free(); - dict->lookup("I", &obj1); -+#endif - } - if (obj1.isBool()) - interpolate = obj1.getBool(); - else - interpolate = gFalse; -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - maskInterpolate = gFalse; - - // image or mask? -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("ImageMask")); -+#else - dict->lookup(const_cast<char*>("ImageMask"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("IM")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("IM"), &obj1); -+#endif - } - mask = gFalse; - if (obj1.isBool()) { -@@ -2650,14 +2900,24 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - else if (!obj1.isNull()) { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // bit depth - if (bits == 0) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("BitsPerComponent")); -+#else - dict->lookup(const_cast<char*>("BitsPerComponent"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("BPC")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("BPC"), &obj1); -+#endif - } - if (obj1.isInt()) { - bits = obj1.getInt(); -@@ -2666,7 +2926,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } else { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - - // display a mask -@@ -2676,21 +2938,37 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - goto err1; - } - invert = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("Decode")); -+#else - dict->lookup(const_cast<char*>("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("D")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("D"), &obj1); -+#endif - } - if (obj1.isArray()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(0); -+#else - obj1.arrayGet(0, &obj2); -+#endif - if (obj2.isInt() && obj2.getInt() == 1) { - invert = gTrue; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } else if (!obj1.isNull()) { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // draw it - builder->addImageMask(state, str, width, height, invert, interpolate); -@@ -2698,18 +2976,36 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } else { - // get color space and color map - GfxColorSpace *colorSpace; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("ColorSpace")); -+#else - dict->lookup(const_cast<char*>("ColorSpace"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("CS")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("CS"), &obj1); -+#endif - } - if (obj1.isName()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = res->lookupColorSpace(obj1.getName()); -+#else - res->lookupColorSpace(obj1.getName(), &obj2); -+#endif - if (!obj2.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = std::move(obj2); -+#else - obj1.free(); - obj1 = obj2; -+#endif - } else { -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } - if (!obj1.isNull()) { -@@ -2729,17 +3025,29 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } else { - colorSpace = NULL; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!colorSpace) { - goto err1; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("Decode")); -+#else - dict->lookup(const_cast<char*>("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("D")); -+#else - obj1.free(); - dict->lookup(const_cast<char*>("D"), &obj1); -+#endif - } - GfxImageColorMap *colorMap = new GfxImageColorMap(bits, &obj1, colorSpace); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!colorMap->isOk()) { - delete colorMap; - goto err1; -@@ -2753,8 +3061,13 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - int maskHeight = 0; - maskInvert = gFalse; - GfxImageColorMap *maskColorMap = NULL; -+#if defined(POPPLER_NEW_OBJECT_API) -+ maskObj = dict->lookup(const_cast<char*>("Mask")); -+ smaskObj = dict->lookup(const_cast<char*>("SMask")); -+#else - dict->lookup(const_cast<char*>("Mask"), &maskObj); - dict->lookup(const_cast<char*>("SMask"), &smaskObj); -+#endif - Dict* maskDict; - if (smaskObj.isStream()) { - // soft mask -@@ -2763,58 +3076,108 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } - maskStr = smaskObj.getStream(); - maskDict = smaskObj.streamGetDict(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Width")); -+#else - maskDict->lookup(const_cast<char*>("Width"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("W")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("W"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskWidth = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Height")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("Height"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("H")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("H"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskHeight = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("BitsPerComponent")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("BitsPerComponent"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("BPC")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("BPC"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - int maskBits = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Interpolate")); -+#else - obj1.free(); - maskDict->lookup("Interpolate", &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("I")); -+#else - obj1.free(); - maskDict->lookup("I", &obj1); -+#endif - } - if (obj1.isBool()) - maskInterpolate = obj1.getBool(); - else - maskInterpolate = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("ColorSpace")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("ColorSpace"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("CS")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("CS"), &obj1); -+#endif - } - if (obj1.isName()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = res->lookupColorSpace(obj1.getName()); -+#else - res->lookupColorSpace(obj1.getName(), &obj2); -+#endif - if (!obj2.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = std::move(obj2); -+#else - obj1.free(); - obj1 = obj2; -+#endif - } else { -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } - } - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) -@@ -2824,17 +3187,29 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - #else - GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL); - #endif -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Decode")); -+#else - maskDict->lookup(const_cast<char*>("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("D")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("D"), &obj1); -+#endif - } - maskColorMap = new GfxImageColorMap(maskBits, &obj1, maskColorSpace); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - if (!maskColorMap->isOk()) { - delete maskColorMap; - goto err1; -@@ -2845,9 +3220,15 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - // color key mask - int i; - for (i = 0; i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskObj.arrayGet(i); -+#else - maskObj.arrayGet(i, &obj1); -+#endif - maskColors[i] = obj1.getInt(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - haveColorKeyMask = gTrue; - } else if (maskObj.isStream()) { -@@ -2857,61 +3238,111 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } - maskStr = maskObj.getStream(); - maskDict = maskObj.streamGetDict(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Width")); -+#else - maskDict->lookup(const_cast<char*>("Width"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("W")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("W"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskWidth = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Height")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("Height"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("H")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("H"), &obj1); -+#endif - } - if (!obj1.isInt()) { - goto err2; - } - maskHeight = obj1.getInt(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("ImageMask")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("ImageMask"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("IM")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("IM"), &obj1); -+#endif - } - if (!obj1.isBool() || !obj1.getBool()) { - goto err2; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup("Interpolate"); -+#else - obj1.free(); - maskDict->lookup("Interpolate", &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup("I"); -+#else - obj1.free(); - maskDict->lookup("I", &obj1); -+#endif - } - if (obj1.isBool()) - maskInterpolate = obj1.getBool(); - else - maskInterpolate = gFalse; -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - maskInvert = gFalse; -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("Decode")); -+#else - maskDict->lookup(const_cast<char*>("Decode"), &obj1); -+#endif - if (obj1.isNull()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = maskDict->lookup(const_cast<char*>("D")); -+#else - obj1.free(); - maskDict->lookup(const_cast<char*>("D"), &obj1); -+#endif - } - if (obj1.isArray()) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj2 = obj1.arrayGet(0); -+#else - obj1.arrayGet(0, &obj2); -+#endif - if (obj2.isInt() && obj2.getInt() == 1) { - maskInvert = gTrue; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj2.free(); -+#endif - } else if (!obj1.isNull()) { - goto err2; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - haveExplicitMask = gTrue; - } - -@@ -2929,14 +3360,18 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) - } - delete colorMap; - -+#if !defined(POPPLER_NEW_OBJECT_API) - maskObj.free(); - smaskObj.free(); -+#endif - } - - return; - - err2: -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - err1: - error(errSyntaxError, getPos(), "Bad image parameters"); - } -@@ -2961,52 +3396,97 @@ void PdfParser::doForm(Object *str) { - dict = str->streamGetDict(); - - // check form type -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = dict->lookup(const_cast<char*>("FormType")); -+#else - dict->lookup(const_cast<char*>("FormType"), &obj1); -+#endif - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { - error(errSyntaxError, getPos(), "Unknown form type"); - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - - // get bounding box -+#if defined(POPPLER_NEW_OBJECT_API) -+ bboxObj = dict->lookup(const_cast<char*>("BBox")); -+#else - dict->lookup(const_cast<char*>("BBox"), &bboxObj); -+#endif - if (!bboxObj.isArray()) { -+#if !defined(POPPLER_NEW_OBJECT_API) - bboxObj.free(); -+#endif - error(errSyntaxError, getPos(), "Bad form bounding box"); - return; - } - for (i = 0; i < 4; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = bboxObj.arrayGet(i); -+#else - bboxObj.arrayGet(i, &obj1); -+#endif - bbox[i] = obj1.getNum(); -+#if defined(POPPLER_NEW_OBJECT_API) -+ } -+#else - obj1.free(); - } - bboxObj.free(); -+#endif - - // get matrix -+#if defined(POPPLER_NEW_OBJECT_API) -+ matrixObj = dict->lookup(const_cast<char*>("Matrix")); -+#else - dict->lookup(const_cast<char*>("Matrix"), &matrixObj); -+#endif - if (matrixObj.isArray()) { - for (i = 0; i < 6; ++i) { -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj1 = matrixObj.arrayGet(i); -+#else - matrixObj.arrayGet(i, &obj1); -+#endif - m[i] = obj1.getNum(); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj1.free(); -+#endif - } - } else { - m[0] = 1; m[1] = 0; - m[2] = 0; m[3] = 1; - m[4] = 0; m[5] = 0; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - matrixObj.free(); -+#endif - - // get resources -+#if defined(POPPLER_NEW_OBJECT_API) -+ resObj = dict->lookup(const_cast<char*>("Resources")); -+#else - dict->lookup(const_cast<char*>("Resources"), &resObj); -+#endif - resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL; - - // check for a transparency group - transpGroup = isolated = knockout = gFalse; - blendingColorSpace = NULL; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj1 = dict->lookup(const_cast<char*>("Group"))).isDict()) { -+ if ((obj2 = obj1.dictLookup(const_cast<char*>("S"))).isName(const_cast<char*>("Transparency"))) { -+#else - if (dict->lookup(const_cast<char*>("Group"), &obj1)->isDict()) { - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { -+#endif - transpGroup = gTrue; -+#if defined(POPPLER_NEW_OBJECT_API) -+ if (!((obj3 = obj1.dictLookup(const_cast<char*>("CS"))).isNull())) { -+#else - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { -+#endif - #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) - blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); - #elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) -@@ -3015,19 +3495,32 @@ void PdfParser::doForm(Object *str) { - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); - #endif - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj1.dictLookup(const_cast<char*>("I"))).isBool()) { -+#else - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { -+#endif - isolated = obj3.getBool(); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ if ((obj3 = obj1.dictLookup(const_cast<char*>("K"))).isBool()) { -+#else - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("K"), &obj3)->isBool()) { -+#endif - knockout = obj3.getBool(); - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ } -+ } -+#else - obj3.free(); - } - obj2.free(); - } - obj1.free(); -+#endif - - // draw it - ++formDepth; -@@ -3038,7 +3531,9 @@ void PdfParser::doForm(Object *str) { - if (blendingColorSpace) { - delete blendingColorSpace; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - resObj.free(); -+#endif - } - - void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, -@@ -3166,35 +3661,61 @@ Stream *PdfParser::buildImageStream() { - Stream *str; - - // build dictionary -+#if defined(POPPLER_NEW_OBJECT_API) -+ dict = Object(new Dict(xref)); -+ obj = parser->getObj(); -+#else - dict.initDict(xref); - parser->getObj(&obj); -+#endif - while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) { - if (!obj.isName()) { - error(errSyntaxError, getPos(), "Inline image dictionary key must be a name object"); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - } else { - key = copyString(obj.getName()); -+#if defined(POPPLER_NEW_OBJECT_API) -+ obj = parser->getObj(); -+#else - obj.free(); - parser->getObj(&obj); -+#endif - if (obj.isEOF() || obj.isError()) { - gfree(key); - break; - } -+#if defined(POPPLER_NEW_OBJECT_API) -+ dict.dictAdd(key, std::move(obj)); -+ } -+ obj = parser->getObj(); -+#else - dict.dictAdd(key, &obj); - } - parser->getObj(&obj); -+#endif - } - if (obj.isEOF()) { - error(errSyntaxError, getPos(), "End of file in inline image"); -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); - dict.free(); -+#endif - return NULL; - } -+#if !defined(POPPLER_NEW_OBJECT_API) - obj.free(); -+#endif - - // make stream -+#if defined(POPPLER_NEW_OBJECT_API) -+ str = new EmbedStream(parser->getStream(), dict.copy(), gFalse, 0); -+ str = str->addFilters(dict.getDict()); -+#else - str = new EmbedStream(parser->getStream(), &dict, gFalse, 0); - str = str->addFilters(&dict); -+#endif - - return str; - } --- -libgit2 0.26.0 - |