diff options
Diffstat (limited to 'graphics/netpbm/files/patch-pngtopnm.c')
| -rw-r--r-- | graphics/netpbm/files/patch-pngtopnm.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/graphics/netpbm/files/patch-pngtopnm.c b/graphics/netpbm/files/patch-pngtopnm.c index b5387857e1b2..8c4615530bbe 100644 --- a/graphics/netpbm/files/patch-pngtopnm.c +++ b/graphics/netpbm/files/patch-pngtopnm.c @@ -1,6 +1,14 @@ ---- converter/other/pngtopnm.c.orig 2009-09-03 17:34:36.000000000 +0200 -+++ converter/other/pngtopnm.c 2010-05-21 11:24:05.000000000 +0200 -@@ -44,7 +44,7 @@ +--- converter/other/pngtopnm.c.orig 2011-11-25 01:15:46.000000000 +0100 ++++ converter/other/pngtopnm.c 2012-04-24 22:15:14.000000000 +0200 +@@ -37,6 +37,7 @@ + #include <math.h> + #include <float.h> + #include <png.h> /* includes zlib.h and setjmp.h */ ++#include <pngpriv.h> + #define VERSION "2.37.4 (5 December 1999) +netpbm" + + #include "pnm.h" +@@ -44,7 +45,7 @@ #include "nstring.h" #include "shhopt.h" @@ -9,7 +17,7 @@ #error Your PNG library (<png.h>) is incompatible with this Netpbm source code. #error You need either an older PNG library (older than 1.4) #error newer Netpbm source code (at least 10.48) -@@ -482,7 +482,7 @@ +@@ -489,7 +490,7 @@ bool retval; if (info_ptr->valid & PNG_INFO_tRNS) { @@ -18,7 +26,7 @@ /* There seems to be a problem here: you can't compare real -@@ -575,8 +575,8 @@ +@@ -582,8 +583,8 @@ for (i = 0, foundGray = FALSE; i < info_ptr->num_trans && !foundGray; ++i) { @@ -29,7 +37,7 @@ foundGray = TRUE; } } -@@ -647,7 +647,7 @@ +@@ -654,7 +655,7 @@ unsigned int i; trans_mix = TRUE; for (i = 0; i < info_ptr->num_trans; ++i) @@ -38,7 +46,7 @@ trans_mix = FALSE; break; } -@@ -885,7 +885,7 @@ +@@ -892,7 +893,7 @@ setXel(&xelrow[col], fgColor, bgColor, alpha_handling, ((info_ptr->valid & PNG_INFO_tRNS) && (fgColor.r == @@ -47,7 +55,7 @@ totalgamma))) ? 0 : maxval); } -@@ -914,7 +914,7 @@ +@@ -921,7 +922,7 @@ setXel(&xelrow[col], fgColor, bgColor, alpha_handling, (info_ptr->valid & PNG_INFO_tRNS) && index < info_ptr->num_trans ? |