1 --- libpng-1.5.7/contrib/pngminus/makefile.std.orig 2011-12-15 16:45:32.000000000 +0100
2 +++ libpng-1.5.7/contrib/pngminus/makefile.std 2011-12-18 16:24:38.099367091 +0100
4 #PNGLIB = -L$(PNGPATH)/lib -lpng16
5 #PNGLIBS = $(PNGPATH)/lib/libpng16.a
7 -PNGLIB = -L../.. -lpng
8 +PNGLIB = -L../.. -L../../.libs -lpng16
9 PNGLIBS = ../../libpng.a
12 #ZINC = -I$(ZPATH)/include
13 #ZLIB = -L$(ZPATH)/lib -lz
14 #ZLIBS = $(ZPATH)/lib/libz.a
15 -ZINC = -I../../../zlib
16 -ZLIB = -L../../../zlib -lz
17 -ZLIBS = ../../../zlib/libz.a
22 -CPPFLAGS=$(PNGINC) $(ZINC)
23 +CPPFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
25 LDLIBS=$(PNGLIB) $(ZLIB)
26 -LDLIBSS=$(PNGLIBS) $(ZLIBS)
27 +LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
35 -#all: png2pnm$(E) pnm2png$(E)
36 -all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E)
37 +all: png2pnm$(E) pnm2png$(E)
39 png2pnm$(O): png2pnm$(C)
40 $(CC) -c $(CFLAGS) png2pnm$(C)
41 --- libpng-1.6.32/contrib/pngminus/pnm2png.c~ 2017-08-24 21:44:51.000000000 +0200
42 +++ libpng-1.6.32/contrib/pngminus/pnm2png.c 2017-10-22 11:21:14.284686698 +0200
43 @@ -376,7 +376,7 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_
44 /* row_bytes is the width x number of channels x (bit-depth / 8) */
45 row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2);
47 - if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes)
48 + if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes))
52 --- libpng-1.6.32/contrib/pngminus/png2pnm.c~ 2017-08-24 21:44:51.000000000 +0200
53 +++ libpng-1.6.32/contrib/pngminus/png2pnm.c 2017-10-22 11:25:16.018590786 +0200
54 @@ -443,7 +443,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_
55 if (png_pixels != (unsigned char*) NULL)
58 - PNG_UNUSED(raw) /* to quiet a Coverity defect */
63 --- libpng-1.6.32/contrib/pngminus/pnm2png.c~ 2017-10-22 11:26:20.000000000 +0200
64 +++ libpng-1.6.32/contrib/pngminus/pnm2png.c 2017-10-22 11:26:43.537683599 +0200
65 @@ -513,7 +513,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_
66 if (png_pixels != (unsigned char*) NULL)
69 - PNG_UNUSED(raw) /* Quiet a Coverity defect */
72 } /* end of pnm2png */