aboutsummaryrefslogtreecommitdiff
path: root/graphics/tif22pnm/files/patch-png22pnm.c
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/tif22pnm/files/patch-png22pnm.c')
-rw-r--r--graphics/tif22pnm/files/patch-png22pnm.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/graphics/tif22pnm/files/patch-png22pnm.c b/graphics/tif22pnm/files/patch-png22pnm.c
index dc9378f22e29..45212e6231ec 100644
--- a/graphics/tif22pnm/files/patch-png22pnm.c
+++ b/graphics/tif22pnm/files/patch-png22pnm.c
@@ -1,6 +1,14 @@
--- png22pnm.c.orig 2003-03-18 17:14:51.000000000 +0100
-+++ png22pnm.c 2010-03-29 08:27:57.000000000 +0200
-@@ -783,7 +783,7 @@
++++ png22pnm.c 2012-05-04 07:36:40.000000000 +0200
+@@ -40,6 +40,7 @@
+
+ #include <math.h>
+ #include <png.h> /* includes zlib.h and setjmp.h */
++#include <pngpriv.h>
+ #if 0
+ #define VERSION "p2.37.4 (5 December 1999) +netpbm"
+ #else
+@@ -783,7 +784,7 @@
(info_ptr->valid & PNG_INFO_tRNS)) {
trans_mix = TRUE;
for (i = 0 ; i < info_ptr->num_trans ; i++)
@@ -9,7 +17,7 @@
trans_mix = FALSE;
break;
}
-@@ -932,7 +932,7 @@
+@@ -932,7 +933,7 @@
pnm_type = PBM_TYPE;
if (info_ptr->valid & PNG_INFO_tRNS) {
for (i = 0 ; i < info_ptr->num_trans ; i++) {
@@ -18,7 +26,7 @@
pnm_type = PGM_TYPE;
break;
}
-@@ -1009,7 +1009,7 @@
+@@ -1009,7 +1010,7 @@
case PNG_COLOR_TYPE_GRAY:
store_pixel (pnm_pixel, c, c, c,
((info_ptr->valid & PNG_INFO_tRNS) &&
@@ -27,7 +35,7 @@
0 : maxval);
break;
-@@ -1023,7 +1023,7 @@
+@@ -1023,7 +1024,7 @@
info_ptr->palette[c].green, info_ptr->palette[c].blue,
(info_ptr->valid & PNG_INFO_tRNS) &&
c<info_ptr->num_trans ?
@@ -36,7 +44,7 @@
break;
case PNG_COLOR_TYPE_RGB:
-@@ -1031,9 +1031,9 @@
+@@ -1031,9 +1032,9 @@
c3 = get_png_val (png_pixel);
store_pixel (pnm_pixel, c, c2, c3,
((info_ptr->valid & PNG_INFO_tRNS) &&