diff options
Diffstat (limited to 'Build/source/libs/poppler')
3 files changed, 53 insertions, 5 deletions
diff --git a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog index 041ef5aacd8..59065cd60ea 100644 --- a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog +++ b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2015-09-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-Object-functions (new): Declare parameter of Object + member functions initCmd, isStream, and streamIs as const. + 2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de> Imported poppler-0.35.0 source tree from: diff --git a/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-03-Object-functions b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-03-Object-functions new file mode 100644 index 00000000000..cc76a16cd22 --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.35.0-PATCHES/patch-03-Object-functions @@ -0,0 +1,43 @@ +diff -ur poppler-0.35.0.orig/poppler/Object.h poppler-0.35.0/poppler/Object.h +--- poppler-0.35.0.orig/poppler/Object.h 2014-02-09 16:10:32.000000000 +0100 ++++ poppler-0.35.0/poppler/Object.h 2015-09-01 10:16:06.000000000 +0200 +@@ -140,7 +140,7 @@ + Object *initStream(Stream *streamA); + Object *initRef(int numA, int genA) + { initObj(objRef); ref.num = numA; ref.gen = genA; return this; } +- Object *initCmd(char *cmdA) ++ Object *initCmd(const char *cmdA) + { initObj(objCmd); cmd = copyString(cmdA); return this; } + Object *initError() + { initObj(objError); return this; } +@@ -186,7 +186,7 @@ + GBool isName(const char *nameA) + { return type == objName && !strcmp(name, nameA); } + GBool isDict(const char *dictType); +- GBool isStream(char *dictType); ++ GBool isStream(const char *dictType); + GBool isCmd(const char *cmdA) + { return type == objCmd && !strcmp(cmd, cmdA); } + +@@ -233,7 +233,7 @@ + Object *dictGetValNF(int i, Object *obj); + + // Stream accessors. +- GBool streamIs(char *dictType); ++ GBool streamIs(const char *dictType); + void streamReset(); + void streamClose(); + int streamGetChar(); +@@ -337,10 +337,10 @@ + + #include "Stream.h" + +-inline GBool Object::streamIs(char *dictType) ++inline GBool Object::streamIs(const char *dictType) + { OBJECT_TYPE_CHECK(objStream); return stream->getDict()->is(dictType); } + +-inline GBool Object::isStream(char *dictType) ++inline GBool Object::isStream(const char *dictType) + { return type == objStream && streamIs(dictType); } + + inline void Object::streamReset() diff --git a/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h b/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h index 15bea159857..a4a4930ea9d 100644 --- a/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h +++ b/Build/source/libs/poppler/poppler-0.35.0/poppler/Object.h @@ -140,7 +140,7 @@ public: Object *initStream(Stream *streamA); Object *initRef(int numA, int genA) { initObj(objRef); ref.num = numA; ref.gen = genA; return this; } - Object *initCmd(char *cmdA) + Object *initCmd(const char *cmdA) { initObj(objCmd); cmd = copyString(cmdA); return this; } Object *initError() { initObj(objError); return this; } @@ -186,7 +186,7 @@ public: GBool isName(const char *nameA) { return type == objName && !strcmp(name, nameA); } GBool isDict(const char *dictType); - GBool isStream(char *dictType); + GBool isStream(const char *dictType); GBool isCmd(const char *cmdA) { return type == objCmd && !strcmp(cmd, cmdA); } @@ -233,7 +233,7 @@ public: Object *dictGetValNF(int i, Object *obj); // Stream accessors. - GBool streamIs(char *dictType); + GBool streamIs(const char *dictType); void streamReset(); void streamClose(); int streamGetChar(); @@ -337,10 +337,10 @@ inline Object *Object::dictGetValNF(int i, Object *obj) #include "Stream.h" -inline GBool Object::streamIs(char *dictType) +inline GBool Object::streamIs(const char *dictType) { OBJECT_TYPE_CHECK(objStream); return stream->getDict()->is(dictType); } -inline GBool Object::isStream(char *dictType) +inline GBool Object::isStream(const char *dictType) { return type == objStream && streamIs(dictType); } inline void Object::streamReset() |