summaryrefslogtreecommitdiff
path: root/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-23 10:27:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-23 10:27:56 +0000
commit9fbfe507d0f9d90df2880e61eb4e5280206ae6b9 (patch)
tree889986f162ee830547e15a8b0d4c6e12613b0f03 /Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings
parent244a7062d4b2b6d10c769244d2c7e1f57de39018 (diff)
poppler 0.18.4
git-svn-id: svn://tug.org/texlive/trunk@25482 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings')
-rw-r--r--Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings86
1 files changed, 86 insertions, 0 deletions
diff --git a/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings
new file mode 100644
index 00000000000..26c4739b40d
--- /dev/null
+++ b/Build/source/libs/poppler/poppler-0.18.4-PATCHES/patch-02-warnings
@@ -0,0 +1,86 @@
+diff -ur poppler-0.18.4.orig/poppler/Annot.cc poppler-0.18.4/poppler/Annot.cc
+--- poppler-0.18.4.orig/poppler/Annot.cc 2011-11-22 22:33:10.000000000 +0100
++++ poppler-0.18.4/poppler/Annot.cc 2012-02-23 11:07:25.726255602 +0100
+@@ -2643,7 +2643,7 @@
+ y3 = quadrilaterals->getY3(i);
+ x4 = quadrilaterals->getX4(i);
+ y4 = quadrilaterals->getY4(i);
+- h4 = abs(y1 - y3) / 4.0;
++ h4 = fabs(y1 - y3) / 4.0;
+
+ appearBuf->appendf ("{0:.2f} {1:.2f} m\n", x3, y3);
+ appearBuf->appendf ("{0:.2f} {1:.2f} {2:.2f} {3:.2f} {4:.2f} {5:.2f} c\n",
+diff -ur poppler-0.18.4.orig/poppler/GfxState.cc poppler-0.18.4/poppler/GfxState.cc
+--- poppler-0.18.4.orig/poppler/GfxState.cc 2012-01-30 20:32:08.000000000 +0100
++++ poppler-0.18.4/poppler/GfxState.cc 2012-02-23 11:07:25.730261537 +0100
+@@ -3009,7 +3009,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.18.4.orig/poppler/GfxState.h poppler-0.18.4/poppler/GfxState.h
+--- poppler-0.18.4.orig/poppler/GfxState.h 2011-11-22 22:33:12.000000000 +0100
++++ poppler-0.18.4/poppler/GfxState.h 2012-02-23 11:07:25.730261537 +0100
+@@ -100,7 +100,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.18.4.orig/poppler/Hints.cc poppler-0.18.4/poppler/Hints.cc
+--- poppler-0.18.4.orig/poppler/Hints.cc 2011-11-22 22:33:13.000000000 +0100
++++ poppler-0.18.4/poppler/Hints.cc 2012-02-23 11:07:25.730261537 +0100
+@@ -413,7 +413,7 @@
+ {
+ Guint bit, bits;
+
+- if (n < 0) return -1;
++ if (n < 0) return (Guint)-1;
+ if (n == 0) return 0;
+
+ if (n == 1)
+@@ -421,11 +421,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.18.4.orig/poppler/Lexer.cc poppler-0.18.4/poppler/Lexer.cc
+--- poppler-0.18.4.orig/poppler/Lexer.cc 2012-02-15 18:10:57.000000000 +0100
++++ poppler-0.18.4/poppler/Lexer.cc 2012-02-23 11:07:25.730261537 +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.18.4.orig/poppler/Stream.cc poppler-0.18.4/poppler/Stream.cc
+--- poppler-0.18.4.orig/poppler/Stream.cc 2011-11-22 22:33:16.000000000 +0100
++++ poppler-0.18.4/poppler/Stream.cc 2012-02-23 11:07:25.730261537 +0100
+@@ -474,7 +474,7 @@
+ } else if (nBits == 8) {
+ Guchar *line = imgLine;
+ int readChars = str->doGetChars(nVals, line);
+- for ( ; readChars < nVals; readChars++) line[readChars] = EOF;
++ for ( ; readChars < nVals; readChars++) line[readChars] = (Guchar)EOF;
+ } else if (nBits == 16) {
+ // this is a hack to support 16 bits images, everywhere
+ // we assume a component fits in 8 bits, with this hack