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