|
 |
f649ceb |
From 672ef8ce8c39f44163d56c4bbcbf63b876da86c6 Mon Sep 17 00:00:00 2001
|
|
|
f649ceb |
From: David Tardon <dtardon@redhat.com>
|
|
|
f649ceb |
Date: Wed, 6 Sep 2017 15:05:31 +0200
|
|
|
f649ceb |
Subject: [PATCH] adapt to poppler 0.58
|
|
|
f649ceb |
|
|
|
f649ceb |
---
|
|
|
f649ceb |
CMakeScripts/DefineDependsandFlags.cmake | 4 +
|
|
|
f649ceb |
config.h.cmake | 3 +
|
|
|
f649ceb |
src/extension/internal/pdfinput/pdf-input.cpp | 6 +
|
|
|
f649ceb |
src/extension/internal/pdfinput/pdf-parser.cpp | 521 +++++++++++++++++++++++++
|
|
|
f649ceb |
4 files changed, 534 insertions(+)
|
|
|
f649ceb |
|
|
|
f649ceb |
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
|
|
|
f649ceb |
index 46fbe7568b..48979c67e5 100644
|
|
|
f649ceb |
--- a/CMakeScripts/DefineDependsandFlags.cmake
|
|
|
f649ceb |
+++ b/CMakeScripts/DefineDependsandFlags.cmake
|
|
|
f649ceb |
@@ -131,6 +131,10 @@ if(ENABLE_POPPLER)
|
|
|
f649ceb |
POPPLER_VERSION VERSION_EQUAL "0.29.0")
|
|
|
f649ceb |
set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
|
|
|
f649ceb |
endif()
|
|
|
f649ceb |
+ if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
|
|
|
f649ceb |
+ POPPLER_VERSION VERSION_EQUAL "0.58.0")
|
|
|
f649ceb |
+ set(POPPLER_NEW_OBJECT_API ON)
|
|
|
f649ceb |
+ endif()
|
|
|
f649ceb |
else()
|
|
|
f649ceb |
set(ENABLE_POPPLER_CAIRO OFF)
|
|
|
f649ceb |
endif()
|
|
|
f649ceb |
diff --git a/config.h.cmake b/config.h.cmake
|
|
|
f649ceb |
index a7ad4b3552..60bea0d8d7 100644
|
|
|
f649ceb |
--- a/config.h.cmake
|
|
|
f649ceb |
+++ b/config.h.cmake
|
|
|
f649ceb |
@@ -107,6 +107,9 @@
|
|
|
f649ceb |
/* Use color space API from Poppler >= 0.29.0 */
|
|
|
f649ceb |
#cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1
|
|
|
f649ceb |
|
|
|
f649ceb |
+/* Use object API from Poppler >= 0.58.0 */
|
|
|
f649ceb |
+#cmakedefine POPPLER_NEW_OBJECT_API 1
|
|
|
f649ceb |
+
|
|
|
f649ceb |
/* Define to 1 if you have the `pow' function. */
|
|
|
f649ceb |
#cmakedefine HAVE_POW 1
|
|
|
f649ceb |
|
|
|
f649ceb |
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
|
|
|
f649ceb |
index 844d16c175..6e0ee75aab 100644
|
|
|
f649ceb |
--- a/src/extension/internal/pdfinput/pdf-input.cpp
|
|
|
f649ceb |
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
|
|
|
f649ceb |
@@ -846,14 +846,20 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
// Parse the document structure
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ Object obj = page->getContents();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
Object obj;
|
|
|
f649ceb |
page->getContents(&obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!obj.isNull()) {
|
|
|
f649ceb |
pdf_parser->parse(&obj);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
// Cleanup
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
delete pdf_parser;
|
|
|
f649ceb |
delete builder;
|
|
|
f649ceb |
g_free(docname);
|
|
|
f649ceb |
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
|
f649ceb |
index 5ede59bf32..604b7f8079 100644
|
|
|
f649ceb |
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
|
f649ceb |
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
|
f649ceb |
@@ -414,13 +414,21 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
|
|
|
f649ceb |
|
|
|
f649ceb |
if (obj->isArray()) {
|
|
|
f649ceb |
for (int i = 0; i < obj->arrayGetLength(); ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = obj->arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj->arrayGet(i, &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!obj2.isStream()) {
|
|
|
f649ceb |
error(errInternal, -1, "Weird page contents");
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
} else if (!obj->isStream()) {
|
|
|
f649ceb |
error(errInternal, -1, "Weird page contents");
|
|
|
f649ceb |
@@ -439,7 +447,11 @@ void PdfParser::go(GBool /*topLevel*/)
|
|
|
f649ceb |
|
|
|
f649ceb |
// scan a sequence of objects
|
|
|
f649ceb |
int numArgs = 0;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj = parser->getObj();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
parser->getObj(&obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
while (!obj.isEOF()) {
|
|
|
f649ceb |
|
|
|
f649ceb |
// got a command - execute it
|
|
|
f649ceb |
@@ -457,14 +469,20 @@ void PdfParser::go(GBool /*topLevel*/)
|
|
|
f649ceb |
// Run the operation
|
|
|
f649ceb |
execOp(&obj, args, numArgs);
|
|
|
f649ceb |
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
for (int i = 0; i < numArgs; ++i)
|
|
|
f649ceb |
args[i].free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
numArgs = 0;
|
|
|
f649ceb |
|
|
|
f649ceb |
// got an argument - save it
|
|
|
f649ceb |
} else if (numArgs < maxArgs) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ args[numArgs++] = std::move(obj);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
args[numArgs++] = obj;
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// too many arguments - something is wrong
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
@@ -475,13 +493,21 @@ void PdfParser::go(GBool /*topLevel*/)
|
|
|
f649ceb |
printf("\n");
|
|
|
f649ceb |
fflush(stdout);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
// grab the next object
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj = parser->getObj();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
parser->getObj(&obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// args at end with no command
|
|
|
f649ceb |
if (numArgs > 0) {
|
|
|
f649ceb |
@@ -495,8 +521,10 @@ void PdfParser::go(GBool /*topLevel*/)
|
|
|
f649ceb |
printf("\n");
|
|
|
f649ceb |
fflush(stdout);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
for (int i = 0; i < numArgs; ++i)
|
|
|
f649ceb |
args[i].free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
@@ -692,9 +720,13 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
if (length != 0) {
|
|
|
f649ceb |
dash = (double *)gmallocn(length, sizeof(double));
|
|
|
f649ceb |
for (int i = 0; i < length; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ dash[i] = a->get(i).getNum();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
Object obj;
|
|
|
f649ceb |
dash[i] = a->get(i, &obj)->getNum();
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
state->setLineDash(dash, length, args[1].getNum());
|
|
|
f649ceb |
@@ -744,12 +776,18 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
GBool haveBackdropColor = gFalse;
|
|
|
f649ceb |
GBool alpha = gFalse;
|
|
|
f649ceb |
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj1 = res->lookupGState(args[0].getName())).isNull()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!res->lookupGState(args[0].getName(), &obj1)) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isDict()) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "ExtGState '{0:s}' is wrong type"), args[0].getName();
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (printCommands) {
|
|
|
f649ceb |
@@ -759,7 +797,11 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
// transparency support: blend mode, fill/stroke opacity
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if (!((obj2 = obj1.dictLookup(const_cast<char*>("BM"))).isNull())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!obj1.dictLookup(const_cast<char*>("BM"), &obj2)->isNull()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
GfxBlendMode mode = gfxBlendNormal;
|
|
|
f649ceb |
if (state->parseBlendMode(&obj2, &mode)) {
|
|
|
f649ceb |
state->setBlendMode(mode);
|
|
|
f649ceb |
@@ -767,40 +809,71 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj2 = obj1.dictLookup(const_cast<char*>("ca"))).isNum()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("ca"), &obj2)->isNum()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
state->setFillOpacity(obj2.getNum());
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj2 = obj1.dictLookup(const_cast<char*>("CA"))).isNum()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("CA"), &obj2)->isNum()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
state->setStrokeOpacity(obj2.getNum());
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// fill/stroke overprint
|
|
|
f649ceb |
GBool haveFillOP = gFalse;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((haveFillOP = (obj2 = obj1.dictLookup(const_cast<char*>("op"))).isBool())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if ((haveFillOP = (obj1.dictLookup(const_cast<char*>("op"), &obj2)->isBool()))) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
state->setFillOverprint(obj2.getBool());
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj2 = obj1.dictLookup(const_cast<char*>("OP"))).isBool()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("OP"), &obj2)->isBool()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
state->setStrokeOverprint(obj2.getBool());
|
|
|
f649ceb |
if (!haveFillOP) {
|
|
|
f649ceb |
state->setFillOverprint(obj2.getBool());
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// stroke adjust
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj2 = obj1.dictLookup(const_cast<char*>("SA"))).isBool()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("SA"), &obj2)->isBool()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
state->setStrokeAdjust(obj2.getBool());
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// transfer function
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj2 = obj1.dictLookup(const_cast<char*>("TR2"))).isNull()) {
|
|
|
f649ceb |
+ obj2 = obj1.dictLookup(const_cast<char*>("TR"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("TR2"), &obj2)->isNull()) {
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
obj1.dictLookup(const_cast<char*>("TR"), &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj2.isName(const_cast<char*>("Default")) ||
|
|
|
f649ceb |
obj2.isName(const_cast<char*>("Identity"))) {
|
|
|
f649ceb |
@@ -809,9 +882,15 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
} else if (obj2.isArray() && obj2.arrayGetLength() == 4) {
|
|
|
f649ceb |
int pos = 4;
|
|
|
f649ceb |
for (int i = 0; i < 4; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj3 = obj2.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj2.arrayGet(i, &obj3);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
funcs[i] = Function::parse(&obj3);
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!funcs[i]) {
|
|
|
f649ceb |
pos = i;
|
|
|
f649ceb |
break;
|
|
|
f649ceb |
@@ -828,21 +907,37 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
} else if (!obj2.isNull()) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// soft mask
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if (!((obj2 = obj1.dictLookup(const_cast<char*>("SMask"))).isNull())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!obj1.dictLookup(const_cast<char*>("SMask"), &obj2)->isNull()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj2.isName(const_cast<char*>("None"))) {
|
|
|
f649ceb |
builder->clearSoftMask(state);
|
|
|
f649ceb |
} else if (obj2.isDict()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj3 = obj2.dictLookup(const_cast<char*>("S"))).isName(const_cast<char*>("Alpha"))) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (obj2.dictLookup(const_cast<char*>("S"), &obj3)->isName(const_cast<char*>("Alpha"))) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
alpha = gTrue;
|
|
|
f649ceb |
} else { // "Luminosity"
|
|
|
f649ceb |
alpha = gFalse;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
funcs[0] = NULL;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if (!((obj3 = obj2.dictLookup(const_cast<char*>("TR"))).isNull())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!obj2.dictLookup(const_cast<char*>("TR"), &obj3)->isNull()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
funcs[0] = Function::parse(&obj3);
|
|
|
f649ceb |
if (funcs[0]->getInputSize() != 1 ||
|
|
|
f649ceb |
funcs[0]->getOutputSize() != 1) {
|
|
|
f649ceb |
@@ -851,26 +946,45 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
funcs[0] = NULL;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((haveBackdropColor = (obj3 = obj2.dictLookup(const_cast<char*>("BC"))).isArray())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
if ((haveBackdropColor = obj2.dictLookup(const_cast<char*>("BC"), &obj3)->isArray())) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
for (int i = 0; i < gfxColorMaxComps; ++i) {
|
|
|
f649ceb |
backdropColor.c[i] = 0;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
for (int i = 0; i < obj3.arrayGetLength() && i < gfxColorMaxComps; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj4 = obj3.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj3.arrayGet(i, &obj4);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj4.isNum()) {
|
|
|
f649ceb |
backdropColor.c[i] = dblToCol(obj4.getNum());
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj4.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj3 = obj2.dictLookup(const_cast<char*>("G"))).isStream()) {
|
|
|
f649ceb |
+ if ((obj4 = obj3.streamGetDict()->lookup(const_cast<char*>("Group"))).isDict()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
if (obj2.dictLookup(const_cast<char*>("G"), &obj3)->isStream()) {
|
|
|
f649ceb |
if (obj3.streamGetDict()->lookup(const_cast<char*>("Group"), &obj4)->isDict()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
GfxColorSpace *blendingColorSpace = 0;
|
|
|
f649ceb |
GBool isolated = gFalse;
|
|
|
f649ceb |
GBool knockout = gFalse;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if (!((obj5 = obj4.dictLookup(const_cast<char*>("CS"))).isNull())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
|
|
f649ceb |
blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
|
|
|
f649ceb |
#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
|
|
f649ceb |
@@ -879,15 +993,25 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
|
|
|
f649ceb |
#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj5 = obj4.dictLookup(const_cast<char*>("I"))).isBool()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj5.free();
|
|
|
f649ceb |
if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
isolated = obj5.getBool();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj5 = obj4.dictLookup(const_cast<char*>("K"))).isBool()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj5.free();
|
|
|
f649ceb |
if (obj4.dictLookup(const_cast<char*>("K"), &obj5)->isBool()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
knockout = obj5.getBool();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj5.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!haveBackdropColor) {
|
|
|
f649ceb |
if (blendingColorSpace) {
|
|
|
f649ceb |
blendingColorSpace->getDefaultColor(&backdropColor);
|
|
|
f649ceb |
@@ -906,18 +1030,24 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj4.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else if (!obj2.isNull()) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
void PdfParser::doSoftMask(Object *str, GBool alpha,
|
|
|
f649ceb |
@@ -938,43 +1068,79 @@ void PdfParser::doSoftMask(Object *str, GBool alpha,
|
|
|
f649ceb |
dict = str->streamGetDict();
|
|
|
f649ceb |
|
|
|
f649ceb |
// check form type
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("FormType"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("FormType"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Unknown form type");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// get bounding box
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("BBox"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("BBox"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!obj1.isArray()) {
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Bad form bounding box");
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
for (i = 0; i < 4; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = obj1.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.arrayGet(i, &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
bbox[i] = obj2.getNum();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ }
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// get matrix
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("Matrix"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Matrix"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isArray()) {
|
|
|
f649ceb |
for (i = 0; i < 6; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = obj1.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.arrayGet(i, &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
m[i] = obj2.getNum();
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
m[0] = 1; m[1] = 0;
|
|
|
f649ceb |
m[2] = 0; m[3] = 1;
|
|
|
f649ceb |
m[4] = 0; m[5] = 0;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// get resources
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("Resources"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Resources"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
resDict = obj1.isDict() ? obj1.getDict() : (Dict *)NULL;
|
|
|
f649ceb |
|
|
|
f649ceb |
// draw it
|
|
|
f649ceb |
@@ -987,7 +1153,9 @@ void PdfParser::doSoftMask(Object *str, GBool alpha,
|
|
|
f649ceb |
if (blendingColorSpace) {
|
|
|
f649ceb |
delete blendingColorSpace;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
void PdfParser::opSetRenderingIntent(Object /*args*/[], int /*numArgs*/)
|
|
|
f649ceb |
@@ -1084,7 +1252,11 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
Object obj;
|
|
|
f649ceb |
|
|
|
f649ceb |
state->setFillPattern(NULL);
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj = res->lookupColorSpace(args[0].getName());
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
res->lookupColorSpace(args[0].getName(), &obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
GfxColorSpace *colorSpace = 0;
|
|
|
f649ceb |
#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
|
|
f649ceb |
@@ -1106,7 +1278,9 @@ void PdfParser::opSetFillColorSpace(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
colorSpace = GfxColorSpace::parse(&obj, NULL);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
#endif
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (colorSpace) {
|
|
|
f649ceb |
GfxColor color;
|
|
|
f649ceb |
state->setFillColorSpace(colorSpace);
|
|
|
f649ceb |
@@ -1125,7 +1299,11 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
GfxColorSpace *colorSpace = 0;
|
|
|
f649ceb |
|
|
|
f649ceb |
state->setStrokePattern(NULL);
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj = res->lookupColorSpace(args[0].getName());
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
res->lookupColorSpace(args[0].getName(), &obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
|
|
f649ceb |
if (obj.isNull()) {
|
|
|
f649ceb |
colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
|
|
|
f649ceb |
@@ -1145,7 +1323,9 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
colorSpace = GfxColorSpace::parse(&obj, NULL);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
#endif
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (colorSpace) {
|
|
|
f649ceb |
GfxColor color;
|
|
|
f649ceb |
state->setStrokeColorSpace(colorSpace);
|
|
|
f649ceb |
@@ -2375,7 +2555,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
wMode = state->getFont()->getWMode();
|
|
|
f649ceb |
a = args[0].getArray();
|
|
|
f649ceb |
for (int i = 0; i < a->getLength(); ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj = a->get(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
a->get(i, &obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj.isNum()) {
|
|
|
f649ceb |
// this uses the absolute value of the font size to match
|
|
|
f649ceb |
// Acrobat's behavior
|
|
|
f649ceb |
@@ -2392,7 +2576,9 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Element of show/space array must be number or string");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
@@ -2465,7 +2651,11 @@ void PdfParser::doShowText(GooString *s) {
|
|
|
f649ceb |
//out->updateCTM(state, 1, 0, 0, 1, 0, 0);
|
|
|
f649ceb |
if (0){ /*!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
|
|
|
f649ceb |
code, u, uLen)) {*/
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ charProc = ((Gfx8BitFont *)font)->getCharProc(code);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
((Gfx8BitFont *)font)->getCharProc(code, &charProc);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if ((resDict = ((Gfx8BitFont *)font)->getResources())) {
|
|
|
f649ceb |
pushResources(resDict);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
@@ -2478,7 +2668,9 @@ void PdfParser::doShowText(GooString *s) {
|
|
|
f649ceb |
if (resDict) {
|
|
|
f649ceb |
popResources();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
charProc.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
restoreState();
|
|
|
f649ceb |
// GfxState::restore() does *not* restore the current position,
|
|
|
f649ceb |
@@ -2541,23 +2733,43 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
Object obj1, obj2, obj3, refObj;
|
|
|
f649ceb |
|
|
|
f649ceb |
char *name = args[0].getName();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj1 = res->lookupXObject(name)).isNull()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!res->lookupXObject(name, &obj1)) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isStream()) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "XObject '{0:s}' is wrong type", name);
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = obj1.streamGetDict()->lookup(const_cast<char*>("Subtype"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.streamGetDict()->lookup(const_cast<char*>("Subtype"), &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj2.isName(const_cast<char*>("Image"))) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ refObj = res->lookupXObjectNF(name);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
res->lookupXObjectNF(name, &refObj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
doImage(&refObj, obj1.getStream(), gFalse);
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
refObj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else if (obj2.isName(const_cast<char*>("Form"))) {
|
|
|
f649ceb |
doForm(&obj1);
|
|
|
f649ceb |
} else if (obj2.isName(const_cast<char*>("PS"))) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj3 = obj1.streamGetDict()->lookup(const_cast<char*>("Level1"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.streamGetDict()->lookup(const_cast<char*>("Level1"), &obj3);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
/* out->psXObject(obj1.getStream(),
|
|
|
f649ceb |
obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
|
|
|
f649ceb |
} else if (obj2.isName()) {
|
|
|
f649ceb |
@@ -2565,8 +2777,10 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
@@ -2593,10 +2807,18 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
dict = str->getDict();
|
|
|
f649ceb |
|
|
|
f649ceb |
// get size
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("Width"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Width"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("W"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("W"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isInt()){
|
|
|
f649ceb |
width = obj1.getInt();
|
|
|
f649ceb |
@@ -2607,11 +2829,19 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
else {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("Height"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Height"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("H"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("H"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isInt()) {
|
|
|
f649ceb |
height = obj1.getInt();
|
|
|
f649ceb |
@@ -2622,26 +2852,46 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
else {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// image interpolation
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup("Interpolate");
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup("Interpolate", &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup("I");
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup("I", &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isBool())
|
|
|
f649ceb |
interpolate = obj1.getBool();
|
|
|
f649ceb |
else
|
|
|
f649ceb |
interpolate = gFalse;
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
maskInterpolate = gFalse;
|
|
|
f649ceb |
|
|
|
f649ceb |
// image or mask?
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("ImageMask"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("ImageMask"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("IM"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("IM"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
mask = gFalse;
|
|
|
f649ceb |
if (obj1.isBool()) {
|
|
|
f649ceb |
@@ -2650,14 +2900,24 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
else if (!obj1.isNull()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// bit depth
|
|
|
f649ceb |
if (bits == 0) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("BitsPerComponent"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("BitsPerComponent"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("BPC"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("BPC"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isInt()) {
|
|
|
f649ceb |
bits = obj1.getInt();
|
|
|
f649ceb |
@@ -2666,7 +2926,9 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
// display a mask
|
|
|
f649ceb |
@@ -2676,21 +2938,37 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
goto err1;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
invert = gFalse;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("Decode"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Decode"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("D"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("D"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isArray()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = obj1.arrayGet(0);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.arrayGet(0, &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj2.isInt() && obj2.getInt() == 1) {
|
|
|
f649ceb |
invert = gTrue;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else if (!obj1.isNull()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// draw it
|
|
|
f649ceb |
builder->addImageMask(state, str, width, height, invert, interpolate);
|
|
|
f649ceb |
@@ -2698,18 +2976,36 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
// get color space and color map
|
|
|
f649ceb |
GfxColorSpace *colorSpace;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("ColorSpace"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("ColorSpace"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("CS"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("CS"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isName()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = res->lookupColorSpace(obj1.getName());
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
res->lookupColorSpace(obj1.getName(), &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!obj2.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = std::move(obj2);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
obj1 = obj2;
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isNull()) {
|
|
|
f649ceb |
@@ -2729,17 +3025,29 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
colorSpace = NULL;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!colorSpace) {
|
|
|
f649ceb |
goto err1;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("Decode"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Decode"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("D"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("D"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
GfxImageColorMap *colorMap = new GfxImageColorMap(bits, &obj1, colorSpace);
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!colorMap->isOk()) {
|
|
|
f649ceb |
delete colorMap;
|
|
|
f649ceb |
goto err1;
|
|
|
f649ceb |
@@ -2753,8 +3061,13 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
int maskHeight = 0;
|
|
|
f649ceb |
maskInvert = gFalse;
|
|
|
f649ceb |
GfxImageColorMap *maskColorMap = NULL;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ maskObj = dict->lookup(const_cast<char*>("Mask"));
|
|
|
f649ceb |
+ smaskObj = dict->lookup(const_cast<char*>("SMask"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Mask"), &maskObj);
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("SMask"), &smaskObj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
Dict* maskDict;
|
|
|
f649ceb |
if (smaskObj.isStream()) {
|
|
|
f649ceb |
// soft mask
|
|
|
f649ceb |
@@ -2763,58 +3076,108 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskStr = smaskObj.getStream();
|
|
|
f649ceb |
maskDict = smaskObj.streamGetDict();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Width"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("Width"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("W"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("W"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isInt()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskWidth = obj1.getInt();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Height"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("Height"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("H"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("H"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isInt()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskHeight = obj1.getInt();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("BitsPerComponent"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("BitsPerComponent"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("BPC"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("BPC"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isInt()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
int maskBits = obj1.getInt();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Interpolate"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup("Interpolate", &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("I"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup("I", &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isBool())
|
|
|
f649ceb |
maskInterpolate = obj1.getBool();
|
|
|
f649ceb |
else
|
|
|
f649ceb |
maskInterpolate = gFalse;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("ColorSpace"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("ColorSpace"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("CS"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("CS"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isName()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = res->lookupColorSpace(obj1.getName());
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
res->lookupColorSpace(obj1.getName(), &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!obj2.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = std::move(obj2);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
obj1 = obj2;
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
}
|
|
|
f649ceb |
#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
|
|
f649ceb |
@@ -2824,17 +3187,29 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
#else
|
|
|
f649ceb |
GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
|
|
|
f649ceb |
#endif
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
|
|
|
f649ceb |
goto err1;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Decode"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("Decode"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("D"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("D"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskColorMap = new GfxImageColorMap(maskBits, &obj1, maskColorSpace);
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!maskColorMap->isOk()) {
|
|
|
f649ceb |
delete maskColorMap;
|
|
|
f649ceb |
goto err1;
|
|
|
f649ceb |
@@ -2845,9 +3220,15 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
// color key mask
|
|
|
f649ceb |
int i;
|
|
|
f649ceb |
for (i = 0; i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskObj.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
maskObj.arrayGet(i, &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
maskColors[i] = obj1.getInt();
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
haveColorKeyMask = gTrue;
|
|
|
f649ceb |
} else if (maskObj.isStream()) {
|
|
|
f649ceb |
@@ -2857,61 +3238,111 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskStr = maskObj.getStream();
|
|
|
f649ceb |
maskDict = maskObj.streamGetDict();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Width"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("Width"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("W"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("W"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isInt()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskWidth = obj1.getInt();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Height"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("Height"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("H"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("H"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isInt()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
maskHeight = obj1.getInt();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("ImageMask"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("ImageMask"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("IM"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("IM"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (!obj1.isBool() || !obj1.getBool()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup("Interpolate");
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup("Interpolate", &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup("I");
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup("I", &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isBool())
|
|
|
f649ceb |
maskInterpolate = obj1.getBool();
|
|
|
f649ceb |
else
|
|
|
f649ceb |
maskInterpolate = gFalse;
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
maskInvert = gFalse;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("Decode"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("Decode"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj1.isNull()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = maskDict->lookup(const_cast<char*>("D"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
maskDict->lookup(const_cast<char*>("D"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj1.isArray()) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj2 = obj1.arrayGet(0);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.arrayGet(0, &obj2);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj2.isInt() && obj2.getInt() == 1) {
|
|
|
f649ceb |
maskInvert = gTrue;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else if (!obj1.isNull()) {
|
|
|
f649ceb |
goto err2;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
haveExplicitMask = gTrue;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
@@ -2929,14 +3360,18 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
|
|
|
f649ceb |
}
|
|
|
f649ceb |
delete colorMap;
|
|
|
f649ceb |
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
maskObj.free();
|
|
|
f649ceb |
smaskObj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
|
|
|
f649ceb |
err2:
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
err1:
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Bad image parameters");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
@@ -2961,52 +3396,97 @@ void PdfParser::doForm(Object *str) {
|
|
|
f649ceb |
dict = str->streamGetDict();
|
|
|
f649ceb |
|
|
|
f649ceb |
// check form type
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = dict->lookup(const_cast<char*>("FormType"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("FormType"), &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Unknown form type");
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// get bounding box
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ bboxObj = dict->lookup(const_cast<char*>("BBox"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("BBox"), &bboxObj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (!bboxObj.isArray()) {
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
bboxObj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Bad form bounding box");
|
|
|
f649ceb |
return;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
for (i = 0; i < 4; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = bboxObj.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
bboxObj.arrayGet(i, &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
bbox[i] = obj1.getNum();
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ }
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
bboxObj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// get matrix
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ matrixObj = dict->lookup(const_cast<char*>("Matrix"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Matrix"), &matrixObj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (matrixObj.isArray()) {
|
|
|
f649ceb |
for (i = 0; i < 6; ++i) {
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj1 = matrixObj.arrayGet(i);
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
matrixObj.arrayGet(i, &obj1);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
m[i] = obj1.getNum();
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
m[0] = 1; m[1] = 0;
|
|
|
f649ceb |
m[2] = 0; m[3] = 1;
|
|
|
f649ceb |
m[4] = 0; m[5] = 0;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
matrixObj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// get resources
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ resObj = dict->lookup(const_cast<char*>("Resources"));
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict->lookup(const_cast<char*>("Resources"), &resObj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL;
|
|
|
f649ceb |
|
|
|
f649ceb |
// check for a transparency group
|
|
|
f649ceb |
transpGroup = isolated = knockout = gFalse;
|
|
|
f649ceb |
blendingColorSpace = NULL;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj1 = dict->lookup(const_cast<char*>("Group"))).isDict()) {
|
|
|
f649ceb |
+ if ((obj2 = obj1.dictLookup(const_cast<char*>("S"))).isName(const_cast<char*>("Transparency"))) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (dict->lookup(const_cast<char*>("Group"), &obj1)->isDict()) {
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
transpGroup = gTrue;
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if (!((obj3 = obj1.dictLookup(const_cast<char*>("CS"))).isNull())) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
|
|
|
f649ceb |
blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
|
|
|
f649ceb |
#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
|
|
|
f649ceb |
@@ -3015,19 +3495,32 @@ void PdfParser::doForm(Object *str) {
|
|
|
f649ceb |
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
|
|
|
f649ceb |
#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj3 = obj1.dictLookup(const_cast<char*>("I"))).isBool()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
isolated = obj3.getBool();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ if ((obj3 = obj1.dictLookup(const_cast<char*>("K"))).isBool()) {
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
if (obj1.dictLookup(const_cast<char*>("K"), &obj3)->isBool()) {
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
knockout = obj3.getBool();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ }
|
|
|
f649ceb |
+ }
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj3.free();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
obj2.free();
|
|
|
f649ceb |
}
|
|
|
f649ceb |
obj1.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// draw it
|
|
|
f649ceb |
++formDepth;
|
|
|
f649ceb |
@@ -3038,7 +3531,9 @@ void PdfParser::doForm(Object *str) {
|
|
|
f649ceb |
if (blendingColorSpace) {
|
|
|
f649ceb |
delete blendingColorSpace;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
resObj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
|
|
|
f649ceb |
void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox,
|
|
|
f649ceb |
@@ -3166,35 +3661,61 @@ Stream *PdfParser::buildImageStream() {
|
|
|
f649ceb |
Stream *str;
|
|
|
f649ceb |
|
|
|
f649ceb |
// build dictionary
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ dict = Object(new Dict(xref));
|
|
|
f649ceb |
+ obj = parser->getObj();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict.initDict(xref);
|
|
|
f649ceb |
parser->getObj(&obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
|
|
|
f649ceb |
if (!obj.isName()) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "Inline image dictionary key must be a name object");
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
} else {
|
|
|
f649ceb |
key = copyString(obj.getName());
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ obj = parser->getObj();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
parser->getObj(&obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
if (obj.isEOF() || obj.isError()) {
|
|
|
f649ceb |
gfree(key);
|
|
|
f649ceb |
break;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ dict.dictAdd(key, std::move(obj));
|
|
|
f649ceb |
+ }
|
|
|
f649ceb |
+ obj = parser->getObj();
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
dict.dictAdd(key, &obj);
|
|
|
f649ceb |
}
|
|
|
f649ceb |
parser->getObj(&obj);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
}
|
|
|
f649ceb |
if (obj.isEOF()) {
|
|
|
f649ceb |
error(errSyntaxError, getPos(), "End of file in inline image");
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
dict.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
return NULL;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
+#if !defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
obj.free();
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
// make stream
|
|
|
f649ceb |
+#if defined(POPPLER_NEW_OBJECT_API)
|
|
|
f649ceb |
+ str = new EmbedStream(parser->getStream(), dict.copy(), gFalse, 0);
|
|
|
f649ceb |
+ str = str->addFilters(dict.getDict());
|
|
|
f649ceb |
+#else
|
|
|
f649ceb |
str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
|
|
|
f649ceb |
str = str->addFilters(&dict);
|
|
|
f649ceb |
+#endif
|
|
|
f649ceb |
|
|
|
f649ceb |
return str;
|
|
|
f649ceb |
}
|
|
|
f649ceb |
--
|
|
|
f649ceb |
2.13.5
|
|
|
f649ceb |
|