diff options
Diffstat (limited to 'Build/source/libs/poppler/poppler-0.22.2-PATCHES')
4 files changed, 199 insertions, 0 deletions
diff --git a/Build/source/libs/poppler/poppler-0.22.2-PATCHES/ChangeLog b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/ChangeLog new file mode 100644 index 00000000000..2019fd58d5b --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/ChangeLog @@ -0,0 +1,86 @@ +2013-03-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.22.2 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + + * patch-01-disable-jpeg (new): We build without libjpeg. + +2012-12-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.22.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + +2012-10-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.21.0 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + +2012-07-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.20.2 source tree from: + http://poppler.freedesktop.org/ + * patch-02-warnings: Adapted. + +2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.20.0 source tree from: + http://poppler.freedesktop.org/ + * patch-01-missing-param (removed): Obsolete. + * patch-02-warnings: Adapted. + +2012-05-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.19.4 source tree from: + http://poppler.freedesktop.org/ + * patch-03-POPPLER_VERSION (removed): Obsolete. + * patch-01-missing-param (new): Bug fix, missing new func param. + * patch-02-warnings: Adapted. + +2012-02-23 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.18.4 source tree from: + http://poppler.freedesktop.org/ + * patch-01-PDF_PARSER_ONLY (removed): Obsolete. + * patch-0[23]-*: Adapted. + +2011-10-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-04-mingw (removed): Instead add `-lgdi32'. + +2011-10-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-04-mingw (new): Split off ... + * patch-01-PDF_PARSER_ONLY: ... from here. + +2011-10-10 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-POPPLER_VERSION: Reorg definition of POPPLER_VERSION. + +2011-10-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported poppler-0.18.0 source tree from: + http://poppler.freedesktop.org/ + * patch-0[123]-*: Adapted. + +2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-01-PDF_PARSER_ONLY: Fix PDF_PARSER_ONLY for MinGW. + + * patch-03-POPPLER_VERSION (new): #define POPPLER_VERSION. + +2011-04-12 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-02-warnings (new): + poppler/Movie.cc: Cast -1 to Gulong. + goo/PNGWriter.h: Add newline at end of file. + +2011-04-12 Taco Hoekwater <taco@luatex.org> + + Imported poppler-0.12.4 source tree from: + http://poppler.freedesktop.org/ + + * patch-01-PDF_PARSER_ONLY (new): Implement PDF_PARSER_ONLY. + diff --git a/Build/source/libs/poppler/poppler-0.22.2-PATCHES/TL-Changes b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/TL-Changes new file mode 100644 index 00000000000..709f142201f --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/TL-Changes @@ -0,0 +1,27 @@ +Changes applied to the poppler-0.22.2 tree as obtained from: + http://poppler.freedesktop.org/ + +Removed: + aclocal.m4 + config.guess + config.sub + configure + depcomp + install-sh + ltmain.sh + missing + Makefile.in + fofi/Makefile.in + goo/Makefile.in + poppler/Makefile.in + +Removed unused dirs: + cmake + cpp + glib + m4 + qt4 + splash + test + utils + diff --git a/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg new file mode 100644 index 00000000000..af41df1adbc --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-01-disable-jpeg @@ -0,0 +1,12 @@ +diff -ur -N poppler-0.22.2.orig/poppler/Stream.h poppler-0.22.2/poppler/Stream.h +--- poppler-0.22.2.orig/poppler/Stream.h 2013-03-08 16:36:25.000000000 +0100 ++++ poppler-0.22.2/poppler/Stream.h 2013-03-12 10:45:21.752691733 +0100 +@@ -850,7 +850,7 @@ + class DCTStream: public FilterStream { + public: + +- DCTStream(Stream *strA, int colorXformA); ++ DCTStream(Stream *strA, int colorXformA, Object *dict); + virtual ~DCTStream(); + virtual StreamKind getKind() { return strDCT; } + virtual void reset(); diff --git a/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-02-warnings new file mode 100644 index 00000000000..a3497aef8ba --- /dev/null +++ b/Build/source/libs/poppler/poppler-0.22.2-PATCHES/patch-02-warnings @@ -0,0 +1,74 @@ +diff -ur poppler-0.22.2.orig/poppler/GfxState.cc poppler-0.22.2/poppler/GfxState.cc +--- poppler-0.22.2.orig/poppler/GfxState.cc 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/GfxState.cc 2013-03-12 09:42:59.000000000 +0100 +@@ -3433,7 +3433,7 @@ + + getParameterRange(&sMin, &sMax, xMin, yMin, xMax, yMax); + upperBound = ctm->norm() * getDistance(sMin, sMax); +- maxSize = ceil(upperBound); ++ maxSize = (int)ceil(upperBound); + maxSize = std::max<int>(maxSize, 2); + + { +diff -ur poppler-0.22.2.orig/poppler/GfxState.h poppler-0.22.2/poppler/GfxState.h +--- poppler-0.22.2.orig/poppler/GfxState.h 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/GfxState.h 2013-03-12 09:42:59.000000000 +0100 +@@ -101,7 +101,7 @@ + } + + static inline Guchar dblToByte(double x) { +- return (x * 255.0); ++ return (Guchar)(x * 255.0); + } + + static inline double byteToDbl(Guchar x) { +diff -ur poppler-0.22.2.orig/poppler/Hints.cc poppler-0.22.2/poppler/Hints.cc +--- poppler-0.22.2.orig/poppler/Hints.cc 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/Hints.cc 2013-03-12 09:42:59.000000000 +0100 +@@ -415,7 +415,7 @@ + { + Guint bit, bits; + +- if (n < 0) return -1; ++ if (n < 0) return (Guint)-1; + if (n == 0) return 0; + + if (n == 1) +@@ -423,11 +423,11 @@ + + bit = (readBit(str) << (n-1)); + if (bit == (Guint) -1) +- return -1; ++ return (Guint)-1; + + bits = readBits(n-1, str); + if (bits == (Guint) -1) +- return -1; ++ return (Guint)-1; + + return bit | bits; + } +diff -ur poppler-0.22.2.orig/poppler/Lexer.cc poppler-0.22.2/poppler/Lexer.cc +--- poppler-0.22.2.orig/poppler/Lexer.cc 2013-02-20 21:09:05.000000000 +0100 ++++ poppler-0.22.2/poppler/Lexer.cc 2013-03-12 09:42:59.000000000 +0100 +@@ -216,7 +216,7 @@ + overflownUnsignedInteger = gTrue; + xf = xi * 10.0 + (c - '0'); + } else { +- xui = xi * 10.0 + (c - '0'); ++ xui = (unsigned int)(xi * 10.0 + (c - '0')); + } + } else { + xi = xi * 10 + (c - '0'); +diff -ur poppler-0.22.2.orig/poppler/Stream.cc poppler-0.22.2/poppler/Stream.cc +--- poppler-0.22.2.orig/poppler/Stream.cc 2013-03-08 16:38:39.000000000 +0100 ++++ poppler-0.22.2/poppler/Stream.cc 2013-03-12 09:42:59.000000000 +0100 +@@ -480,7 +480,7 @@ + Guchar *p; + + int readChars = str->doGetChars(inputLineSize, inputLine); +- for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF; ++ for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = (Guchar)EOF; + if (nBits == 1) { + p = inputLine; + for (i = 0; i < nVals; i += 8) { |