xref: /aoo4110/main/libpng/libpng-1.5.1.patch (revision b1cdbd2c) 
1--- misc/libpng-1.5.1/makefile.mk	2011-03-24 21:49:50.911397154 +0100
2+++ misc/build/libpng-1.5.1/makefile.mk	2011-03-24 21:47:23.379397048 +0100
3@@ -1 +1,49 @@
4-dummy
5+#*************************************************************************
6+#
7+#   Copyright according the GNU Public License.
8+#
9+#*************************************************************************
10+
11+PRJ=..$/..$/..$/..
12+
13+PRJNAME=libpng
14+TARGET=libpng
15+LIBTARGET=NO
16+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
17+VISIBILITY_HIDDEN=TRUE
18+
19+# --- Settings -----------------------------------------------------------
20+
21+.INCLUDE :  settings.mk
22+
23+
24+.IF "$(GUI)$(CPU)"=="WNTP"
25+CFLAGS=$(CFLAGS) -Od
26+.ENDIF
27+
28+# --- Files --------------------------------------------------------
29+
30+SLOFILES=	 $(SLO)$/png.obj 		\
31+                $(SLO)$/pngerror.obj	\
32+                $(SLO)$/pngget.obj	\
33+                $(SLO)$/pngmem.obj	\
34+                $(SLO)$/pngpread.obj	\
35+                $(SLO)$/pngread.obj	\
36+                $(SLO)$/pngrio.obj	\
37+                $(SLO)$/pngrtran.obj	\
38+                $(SLO)$/pngrutil.obj	\
39+                $(SLO)$/pngset.obj	\
40+                $(SLO)$/pngtest.obj	\
41+                $(SLO)$/pngtrans.obj	\
42+                $(SLO)$/pngvalid.obj	\
43+                $(SLO)$/pngwio.obj	\
44+                $(SLO)$/pngwrite.obj	\
45+                $(SLO)$/pngwtran.obj	\
46+                $(SLO)$/pngwutil.obj
47+
48+LIB1TARGET=$(SLB)$/$(TARGET).lib
49+LIB1ARCHIV=$(LB)$/$(TARGET).a
50+LIB1OBJFILES=$(SLOFILES)
51+
52+.INCLUDE :  target.mk
53+
54--- misc/libpng-1.5.1/pnglibconf.h	2011-03-24 21:49:50.913397154 +0100
55+++ misc/build/libpng-1.5.1/pnglibconf.h	2011-03-24 21:47:23.380397048 +0100
56@@ -1 +1,176 @@
57-dummy
58+
59+/* libpng STANDARD API DEFINITION */
60+
61+/* pnglibconf.h - library build configuration */
62+
63+/* libpng version 1.5.0 - last changed on January 6, 2011 */
64+
65+/* Copyright (c) 1998-2011 Glenn Randers-Pehrson */
66+
67+/* This code is released under the libpng license. */
68+/* For conditions of distribution and use, see the disclaimer */
69+/* and license in png.h */
70+
71+/* pnglibconf.h */
72+/* Machine generated file: DO NOT EDIT */
73+/* Derived from: scripts/pnglibconf.dfa */
74+#ifndef PNGLCONF_H
75+#define PNGLCONF_H
76+/* settings */
77+#define PNG_MAX_GAMMA_8 11
78+#define PNG_CALLOC_SUPPORTED
79+#define PNG_QUANTIZE_RED_BITS 5
80+#define PNG_USER_WIDTH_MAX 1000000L
81+#define PNG_QUANTIZE_GREEN_BITS 5
82+#define PNG_API_RULE 0
83+#define PNG_QUANTIZE_BLUE_BITS 5
84+#define PNG_USER_CHUNK_CACHE_MAX 0
85+#define PNG_USER_HEIGHT_MAX 1000000L
86+#define PNG_sCAL_PRECISION 5
87+#define PNG_COST_SHIFT 3
88+#define PNG_WEIGHT_SHIFT 8
89+#define PNG_USER_CHUNK_MALLOC_MAX 0
90+#define PNG_DEFAULT_READ_MACROS 1
91+#define PNG_ZBUF_SIZE 8192
92+#define PNG_GAMMA_THRESHOLD_FIXED 5000
93+/* end of settings */
94+/* options */
95+#define PNG_INFO_IMAGE_SUPPORTED
96+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
97+#define PNG_POINTER_INDEXING_SUPPORTED
98+#define PNG_WARNINGS_SUPPORTED
99+#define PNG_FLOATING_ARITHMETIC_SUPPORTED
100+#define PNG_WRITE_SUPPORTED
101+#define PNG_WRITE_INTERLACING_SUPPORTED
102+#define PNG_WRITE_16BIT_SUPPORTED
103+#define PNG_EASY_ACCESS_SUPPORTED
104+#define PNG_ALIGN_MEMORY_SUPPORTED
105+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
106+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
107+#define PNG_USER_LIMITS_SUPPORTED
108+#define PNG_FIXED_POINT_SUPPORTED
109+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
110+#define PNG_ERROR_TEXT_SUPPORTED
111+#define PNG_READ_SUPPORTED
112+/*#undef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED*/
113+#define PNG_BENIGN_ERRORS_SUPPORTED
114+#define PNG_SETJMP_SUPPORTED
115+#define PNG_WRITE_FLUSH_SUPPORTED
116+#define PNG_MNG_FEATURES_SUPPORTED
117+#define PNG_FLOATING_POINT_SUPPORTED
118+#define PNG_INCH_CONVERSIONS_SUPPORTED
119+#define PNG_STDIO_SUPPORTED
120+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
121+#define PNG_USER_MEM_SUPPORTED
122+#define PNG_IO_STATE_SUPPORTED
123+#define PNG_SET_USER_LIMITS_SUPPORTED
124+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
125+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
126+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
127+#define PNG_WRITE_FILTER_SUPPORTED
128+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
129+#define PNG_WRITE_iCCP_SUPPORTED
130+#define PNG_READ_TRANSFORMS_SUPPORTED
131+#define PNG_READ_GAMMA_SUPPORTED
132+#define PNG_READ_bKGD_SUPPORTED
133+#define PNG_UNKNOWN_CHUNKS_SUPPORTED
134+#define PNG_READ_sCAL_SUPPORTED
135+#define PNG_WRITE_hIST_SUPPORTED
136+#define PNG_READ_OPT_PLTE_SUPPORTED
137+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
138+#define PNG_WRITE_gAMA_SUPPORTED
139+#define PNG_READ_GRAY_TO_RGB_SUPPORTED
140+#define PNG_WRITE_pCAL_SUPPORTED
141+#define PNG_READ_INVERT_ALPHA_SUPPORTED
142+#define PNG_WRITE_TRANSFORMS_SUPPORTED
143+#define PNG_READ_sBIT_SUPPORTED
144+#define PNG_READ_PACK_SUPPORTED
145+#define PNG_WRITE_SWAP_SUPPORTED
146+#define PNG_READ_cHRM_SUPPORTED
147+#define PNG_WRITE_tIME_SUPPORTED
148+#define PNG_READ_INTERLACING_SUPPORTED
149+#define PNG_READ_tRNS_SUPPORTED
150+#define PNG_WRITE_pHYs_SUPPORTED
151+#define PNG_WRITE_INVERT_SUPPORTED
152+#define PNG_READ_RGB_TO_GRAY_SUPPORTED
153+#define PNG_WRITE_sRGB_SUPPORTED
154+#define PNG_READ_oFFs_SUPPORTED
155+#define PNG_WRITE_FILLER_SUPPORTED
156+#define PNG_WRITE_TEXT_SUPPORTED
157+#define PNG_WRITE_SHIFT_SUPPORTED
158+#define PNG_PROGRESSIVE_READ_SUPPORTED
159+#define PNG_READ_SHIFT_SUPPORTED
160+#define PNG_CONVERT_tIME_SUPPORTED
161+#define PNG_READ_USER_TRANSFORM_SUPPORTED
162+#define PNG_READ_INT_FUNCTIONS_SUPPORTED
163+#define PNG_READ_USER_CHUNKS_SUPPORTED
164+#define PNG_READ_hIST_SUPPORTED
165+#define PNG_READ_16BIT_SUPPORTED
166+#define PNG_READ_SWAP_ALPHA_SUPPORTED
167+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
168+#define PNG_SEQUENTIAL_READ_SUPPORTED
169+#define PNG_READ_BACKGROUND_SUPPORTED
170+#define PNG_READ_QUANTIZE_SUPPORTED
171+#define PNG_READ_iCCP_SUPPORTED
172+#define PNG_READ_STRIP_ALPHA_SUPPORTED
173+#define PNG_READ_PACKSWAP_SUPPORTED
174+#define PNG_READ_sRGB_SUPPORTED
175+#define PNG_WRITE_tEXt_SUPPORTED
176+#define PNG_READ_gAMA_SUPPORTED
177+#define PNG_READ_pCAL_SUPPORTED
178+#define PNG_READ_EXPAND_SUPPORTED
179+#define PNG_WRITE_sPLT_SUPPORTED
180+#define PNG_READ_SWAP_SUPPORTED
181+#define PNG_READ_tIME_SUPPORTED
182+#define PNG_READ_pHYs_SUPPORTED
183+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
184+#define PNG_TIME_RFC1123_SUPPORTED
185+#define PNG_READ_TEXT_SUPPORTED
186+#define PNG_WRITE_BGR_SUPPORTED
187+#define PNG_USER_CHUNKS_SUPPORTED
188+#define PNG_CONSOLE_IO_SUPPORTED
189+#define PNG_WRITE_PACK_SUPPORTED
190+#define PNG_READ_FILLER_SUPPORTED
191+#define PNG_WRITE_bKGD_SUPPORTED
192+#define PNG_WRITE_tRNS_SUPPORTED
193+#define PNG_READ_sPLT_SUPPORTED
194+#define PNG_WRITE_sCAL_SUPPORTED
195+#define PNG_WRITE_oFFs_SUPPORTED
196+#define PNG_READ_tEXt_SUPPORTED
197+#define PNG_WRITE_sBIT_SUPPORTED
198+#define PNG_READ_INVERT_SUPPORTED
199+#define PNG_READ_16_TO_8_SUPPORTED
200+#define PNG_WRITE_cHRM_SUPPORTED
201+#define PNG_16BIT_SUPPORTED
202+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
203+#define PNG_READ_BGR_SUPPORTED
204+#define PNG_WRITE_PACKSWAP_SUPPORTED
205+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
206+#define PNG_sCAL_SUPPORTED
207+#define PNG_WRITE_zTXt_SUPPORTED
208+#define PNG_sBIT_SUPPORTED
209+#define PNG_cHRM_SUPPORTED
210+#define PNG_bKGD_SUPPORTED
211+#define PNG_tRNS_SUPPORTED
212+#define PNG_WRITE_iTXt_SUPPORTED
213+#define PNG_oFFs_SUPPORTED
214+#define PNG_USER_TRANSFORM_PTR_SUPPORTED
215+#define PNG_USER_TRANSFORM_INFO_SUPPORTED
216+#define PNG_hIST_SUPPORTED
217+#define PNG_iCCP_SUPPORTED
218+#define PNG_sRGB_SUPPORTED
219+#define PNG_READ_zTXt_SUPPORTED
220+#define PNG_gAMA_SUPPORTED
221+#define PNG_pCAL_SUPPORTED
222+#define PNG_CHECK_cHRM_SUPPORTED
223+#define PNG_tIME_SUPPORTED
224+#define PNG_pHYs_SUPPORTED
225+#define PNG_READ_iTXt_SUPPORTED
226+#define PNG_TEXT_SUPPORTED
227+#define PNG_SAVE_INT_32_SUPPORTED
228+#define PNG_sPLT_SUPPORTED
229+#define PNG_tEXt_SUPPORTED
230+#define PNG_zTXt_SUPPORTED
231+#define PNG_iTXt_SUPPORTED
232+/* end of options */
233+#endif /* PNGLCONF_H */
234--- misc/libpng-1.5.1/pngstruct.h	2011-02-03 05:58:17.000000000 +0100
235+++ misc/build/libpng-1.5.1/pngstruct.h	2011-03-24 21:47:23.380397048 +0100
236@@ -24,7 +24,11 @@
237  * in this structure and is required for decompressing the LZ compressed
238  * data in PNG files.
239  */
240+#if defined MACOSX
241 #include "zlib.h"
242+#else
243+#include <external/zlib/zlib.h>
244+#endif
245
246 struct png_struct_def
247 {
248--- misc/libpng-1.5.1/pngtest.c	2011-02-03 05:58:17.000000000 +0100
249+++ misc/build/libpng-1.5.1/pngtest.c	2011-03-24 21:47:23.380397048 +0100
250@@ -31,7 +31,12 @@
251  * of files at once by typing "pngtest -m file1.png file2.png ..."
252  */
253
254+#if defined MACOSX
255 #include "zlib.h"
256+#else
257+#include <external/zlib/zlib.h>
258+#endif
259+
260 #include "png.h"
261 /* Copied from pngpriv.h but only used in error messages below. */
262 #ifndef PNG_ZBUF_SIZE
263--- misc/libpng-1.5.1/pngvalid.c	2011-02-03 05:58:17.000000000 +0100
264+++ misc/build/libpng-1.5.1/pngvalid.c	2011-03-24 21:47:23.381397048 +0100
265@@ -51,7 +51,11 @@
266 #define PNG_READ_16BIT_SUPPORTED
267 #endif
268
269-#include "zlib.h"   /* For crc32 */
270+#if defined MACOSX
271+#include "zlib.h"
272+#else
273+#include <external/zlib/zlib.h>
274+#endif
275
276 #include <float.h>  /* For floating point constants */
277 #include <stdlib.h> /* For malloc */
278