summaryrefslogtreecommitdiff
path: root/xpdf
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2012-07-27 17:31:48 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-27 17:50:23 +0200
commite3d18d2687639dd7687b658cf621f1e9d22b71f4 (patch)
tree408c767aa99662174fb3aa2a4ce80f40044f19a6 /xpdf
parent31dbc60506da093ec35911db6dde03b4ce31169b (diff)
xpdf: fix some warnings
Diffstat (limited to 'xpdf')
-rw-r--r--xpdf/makefile.mk2
-rw-r--r--xpdf/xpdf-3.02-gfxColorMaxComps.patch24
2 files changed, 25 insertions, 1 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 046994fe17e4..ff6dd6a4b76d 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -48,7 +48,7 @@ dummy:
TARFILE_NAME=xpdf-3.02
TARFILE_MD5=599dc4cc65a07ee868cf92a667a913d2
-PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch
+PATCH_FILES=$(TARFILE_NAME).patch xpdf-3.02-ooopwd.patch xpdf-3.02-gfxColorMaxComps.patch
CONFIGURE_DIR=
BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/xpdf/xpdf-3.02-gfxColorMaxComps.patch b/xpdf/xpdf-3.02-gfxColorMaxComps.patch
new file mode 100644
index 000000000000..3f0870b4537e
--- /dev/null
+++ b/xpdf/xpdf-3.02-gfxColorMaxComps.patch
@@ -0,0 +1,24 @@
+--- misc/xpdf-3.02/xpdf/GfxState.cc 2007-02-27 23:05:52.000000000 +0100
++++ misc/build/xpdf-3.02/xpdf/GfxState.cc 2011-05-18 20:08:45.003807128 +0200
+@@ -2678,7 +2678,7 @@
+ double x[16], y[16];
+ Guint xi, yi;
+ GfxColorComp c[4][gfxColorMaxComps];
+- Guint ci[4];
++ Guint ci[gfxColorMaxComps];
+ GfxShadingBitBuf *bitBuf;
+ Object obj1, obj2;
+ int i, j;
+--- misc/xpdf-3.02/xpdf/GfxState.h 2007-02-27 23:05:52.000000000 +0100
++++ misc/build/xpdf-3.02/xpdf/GfxState.h 2011-05-18 20:13:26.973936566 +0200
+@@ -393,8 +393,8 @@
+
+ int nComps; // number of color components (1, 3, or 4)
+ GfxColorSpace *alt; // alternate color space
+- double rangeMin[4]; // min values for each component
+- double rangeMax[4]; // max values for each component
++ double rangeMin[gfxColorMaxComps]; // min values for each component
++ double rangeMax[gfxColorMaxComps]; // max values for each component
+ Ref iccProfileStream; // the ICC profile
+ };
+