FCL/sf/mw/qt: comparison src/3rdparty/libpng/pngread.c

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 /* pngread.c - read a PNG file
 *
-* Last changed in libpng 1.2.37 [June 4, 2009]
+* Last changed in libpng 1.4.0 [January 3, 2010]
-* Copyright (c) 1998-2009 Glenn Randers-Pehrson
+* Copyright (c) 1998-2010 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 *
 * This file contains routines that an application calls directly to
 * read a PNG file or stream.
 */
-#define PNG_INTERNAL
+#define PNG_NO_PEDANTIC_WARNINGS
 #include "png.h"
-#if defined(PNG_READ_SUPPORTED)
+#ifdef PNG_READ_SUPPORTED
+#include "pngpriv.h"
 /* Create a PNG structure for reading, and allocate any memory needed. */
 png_structp PNGAPI
 png_create_read_struct(png_const_charp user_png_ver, png_voidp error_ptr,
 png_error_ptr error_fn, png_error_ptr warn_fn)
 {
 #ifdef PNG_USER_MEM_SUPPORTED
 return (png_create_read_struct_2(user_png_ver, error_ptr, error_fn,
-warn_fn, png_voidp_NULL, png_malloc_ptr_NULL, png_free_ptr_NULL));
+warn_fn, NULL, NULL, NULL));
 }
 /* Alternate create PNG structure for reading, and allocate any memory needed. */
 png_structp PNGAPI
 png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
 #ifdef PNG_SETJMP_SUPPORTED
 volatile
 #endif
 png_structp png_ptr;
+volatile int png_cleanup_needed = 0;
 #ifdef PNG_SETJMP_SUPPORTED
 #ifdef USE_FAR_KEYWORD
 jmp_buf jmpbuf;
 #endif
 #endif
 int i;
 png_debug(1, "in png_create_read_struct");
 #ifdef PNG_USER_MEM_SUPPORTED
 png_ptr = (png_structp)png_create_struct_2(PNG_STRUCT_PNG,
-(png_malloc_ptr)malloc_fn, (png_voidp)mem_ptr);
+malloc_fn, mem_ptr);
 #else
 png_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
 #endif
 if (png_ptr == NULL)
 return (NULL);
 /* Added at libpng-1.2.6 */
 #ifdef PNG_SET_USER_LIMITS_SUPPORTED
-png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
+png_ptr->user_width_max = PNG_USER_WIDTH_MAX;
-png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
+png_ptr->user_height_max = PNG_USER_HEIGHT_MAX;
+/* Added at libpng-1.4.0 */
+png_ptr->user_chunk_cache_max = PNG_USER_CHUNK_CACHE_MAX;
 #endif
 #ifdef PNG_SETJMP_SUPPORTED
+/* Applications that neglect to set up their own setjmp() and then
+encounter a png_error() will longjmp here.  Since the jmpbuf is
+then meaningless we abort instead of returning. */
 #ifdef USE_FAR_KEYWORD
 if (setjmp(jmpbuf))
 #else
-if (setjmp(png_ptr->jmpbuf))
+if (setjmp(png_jmpbuf(png_ptr))) /* Sets longjmp to match setjmp */
 #endif
-{
+PNG_ABORT();
+#ifdef USE_FAR_KEYWORD
+png_memcpy(png_jmpbuf(png_ptr), jmpbuf, png_sizeof(jmp_buf));
+#endif
+#endif /* PNG_SETJMP_SUPPORTED */
+#ifdef PNG_USER_MEM_SUPPORTED
+png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
+#endif
+png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
+if (user_png_ver)
+{
+i = 0;
+do
+{
+if (user_png_ver[i] != png_libpng_ver[i])
+png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+} while (png_libpng_ver[i++]);
+}
+else
+png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
+if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+{
+/* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
+* we must recompile any applications that use any older library version.
+* For versions after libpng 1.0, we will be compatible, so we need
+* only check the first digit.
+*/
+if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
+(user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
+(user_png_ver[0] == '0' && user_png_ver[2] < '9'))
+{
+#ifdef PNG_STDIO_SUPPORTED
+char msg[80];
+if (user_png_ver)
+{
+png_snprintf(msg, 80,
+"Application was compiled with png.h from libpng-%.20s",
+user_png_ver);
+png_warning(png_ptr, msg);
+}
+png_snprintf(msg, 80,
+"Application  is  running with png.c from libpng-%.20s",
+png_libpng_ver);
+png_warning(png_ptr, msg);
+#endif
+#ifdef PNG_ERROR_NUMBERS_SUPPORTED
+png_ptr->flags = 0;
+#endif
+png_warning(png_ptr,
+"Incompatible libpng version in application and library");
+png_cleanup_needed = 1;
+}
+}
+if (!png_cleanup_needed)
+{
+/* Initialize zbuf - compression buffer */
+png_ptr->zbuf_size = PNG_ZBUF_SIZE;
+png_ptr->zbuf = (png_bytep)png_malloc_warn(png_ptr,
+png_ptr->zbuf_size);
+if (png_ptr->zbuf == NULL)
+png_cleanup_needed = 1;
+}
+png_ptr->zstream.zalloc = png_zalloc;
+png_ptr->zstream.zfree = png_zfree;
+png_ptr->zstream.opaque = (voidpf)png_ptr;
+if (!png_cleanup_needed)
+{
+switch (inflateInit(&png_ptr->zstream))
+{
+case Z_OK: /* Do nothing */ break;
+case Z_MEM_ERROR:
+case Z_STREAM_ERROR: png_warning(png_ptr, "zlib memory error");
+png_cleanup_needed = 1; break;
+case Z_VERSION_ERROR: png_warning(png_ptr, "zlib version error");
+png_cleanup_needed = 1; break;
+default: png_warning(png_ptr, "Unknown zlib error");
+png_cleanup_needed = 1;
+}
+}
+if (png_cleanup_needed)
+{
+/* Clean up PNG structure and deallocate any memory. */
 png_free(png_ptr, png_ptr->zbuf);
 png_ptr->zbuf = NULL;
 #ifdef PNG_USER_MEM_SUPPORTED
 png_destroy_struct_2((png_voidp)png_ptr,
 (png_free_ptr)free_fn, (png_voidp)mem_ptr);
 #else
 png_destroy_struct((png_voidp)png_ptr);
 #endif
 return (NULL);
 }
-#ifdef USE_FAR_KEYWORD
-png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
-#endif
-#endif
-#ifdef PNG_USER_MEM_SUPPORTED
-png_set_mem_fn(png_ptr, mem_ptr, malloc_fn, free_fn);
-#endif
-png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
-if (user_png_ver)
-{
-i = 0;
-do
-{
-if (user_png_ver[i] != png_libpng_ver[i])
-png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-} while (png_libpng_ver[i++]);
-}
-else
-png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
-{
-/* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
-* we must recompile any applications that use any older library version.
-* For versions after libpng 1.0, we will be compatible, so we need
-* only check the first digit.
-*/
-if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
-(user_png_ver[0] == '1' && user_png_ver[2] != png_libpng_ver[2]) ||
-(user_png_ver[0] == '0' && user_png_ver[2] < '9'))
-{
-#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
-char msg[80];
-if (user_png_ver)
-{
-png_snprintf(msg, 80,
-"Application was compiled with png.h from libpng-%.20s",
-user_png_ver);
-png_warning(png_ptr, msg);
-}
-png_snprintf(msg, 80,
-"Application  is  running with png.c from libpng-%.20s",
-png_libpng_ver);
-png_warning(png_ptr, msg);
-#endif
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-png_ptr->flags = 0;
-#endif
-png_error(png_ptr,
-"Incompatible libpng version in application and library");
-}
-}
-/* Initialize zbuf - compression buffer */
-png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
-(png_uint_32)png_ptr->zbuf_size);
-png_ptr->zstream.zalloc = png_zalloc;
-png_ptr->zstream.zfree = png_zfree;
-png_ptr->zstream.opaque = (voidpf)png_ptr;
-switch (inflateInit(&png_ptr->zstream))
-{
-case Z_OK: /* Do nothing */ break;
-case Z_MEM_ERROR:
-case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory error"); break;
-case Z_VERSION_ERROR: png_error(png_ptr, "zlib version error"); break;
-default: png_error(png_ptr, "Unknown zlib error");
-}
 png_ptr->zstream.next_out = png_ptr->zbuf;
 png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
+png_set_read_fn(png_ptr, NULL, NULL);
-#ifdef PNG_SETJMP_SUPPORTED
-/* Applications that neglect to set up their own setjmp() and then encounter
-a png_error() will longjmp here.  Since the jmpbuf is then meaningless we
-abort instead of returning. */
-#ifdef USE_FAR_KEYWORD
-if (setjmp(jmpbuf))
-PNG_ABORT();
-png_memcpy(png_ptr->jmpbuf, jmpbuf, png_sizeof(jmp_buf));
-#else
-if (setjmp(png_ptr->jmpbuf))
-PNG_ABORT();
-#endif
-#endif
 return (png_ptr);
 }
-#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
-/* Initialize PNG structure for reading, and allocate any memory needed.
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-This interface is deprecated in favour of the png_create_read_struct(),
-and it will disappear as of libpng-1.3.0. */
-#undef png_read_init
-void PNGAPI
-png_read_init(png_structp png_ptr)
-{
-/* We only come here via pre-1.0.7-compiled applications */
-png_read_init_2(png_ptr, "1.0.6 or earlier", 0, 0);
-}
-void PNGAPI
-png_read_init_2(png_structp png_ptr, png_const_charp user_png_ver,
-png_size_t png_struct_size, png_size_t png_info_size)
-{
-/* We only come here via pre-1.0.12-compiled applications */
-if (png_ptr == NULL)
-return;
-#if !defined(PNG_NO_STDIO) && !defined(_WIN32_WCE)
-if (png_sizeof(png_struct) > png_struct_size ||
-png_sizeof(png_info) > png_info_size)
-{
-char msg[80];
-png_ptr->warning_fn = NULL;
-if (user_png_ver)
-{
-png_snprintf(msg, 80,
-"Application was compiled with png.h from libpng-%.20s",
-user_png_ver);
-png_warning(png_ptr, msg);
-}
-png_snprintf(msg, 80,
-"Application  is  running with png.c from libpng-%.20s",
-png_libpng_ver);
-png_warning(png_ptr, msg);
-}
-#endif
-if (png_sizeof(png_struct) > png_struct_size)
-{
-png_ptr->error_fn = NULL;
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-png_ptr->flags = 0;
-#endif
-png_error(png_ptr,
-"The png struct allocated by the application for reading is too small.");
-}
-if (png_sizeof(png_info) > png_info_size)
-{
-png_ptr->error_fn = NULL;
-#ifdef PNG_ERROR_NUMBERS_SUPPORTED
-png_ptr->flags = 0;
-#endif
-png_error(png_ptr,
-"The info struct allocated by application for reading is too small.");
-}
-png_read_init_3(&png_ptr, user_png_ver, png_struct_size);
-}
-#endif /* PNG_1_0_X || PNG_1_2_X */
-void PNGAPI
-png_read_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
-png_size_t png_struct_size)
-{
-#ifdef PNG_SETJMP_SUPPORTED
-jmp_buf tmp_jmp;  /* to save current jump buffer */
-#endif
-int i = 0;
-png_structp png_ptr=*ptr_ptr;
-if (png_ptr == NULL)
-return;
-do
-{
-if (user_png_ver[i] != png_libpng_ver[i])
-{
-#ifdef PNG_LEGACY_SUPPORTED
-png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
-#else
-png_ptr->warning_fn = NULL;
-png_warning(png_ptr,
-"Application uses deprecated png_read_init() and should be recompiled.");
-break;
-#endif
-}
-} while (png_libpng_ver[i++]);
-png_debug(1, "in png_read_init_3");
-#ifdef PNG_SETJMP_SUPPORTED
-/* Save jump buffer and error functions */
-png_memcpy(tmp_jmp, png_ptr->jmpbuf, png_sizeof(jmp_buf));
-#endif
-if (png_sizeof(png_struct) > png_struct_size)
-{
-png_destroy_struct(png_ptr);
-*ptr_ptr = (png_structp)png_create_struct(PNG_STRUCT_PNG);
-png_ptr = *ptr_ptr;
-}
-/* Reset all variables to 0 */
-png_memset(png_ptr, 0, png_sizeof(png_struct));
-#ifdef PNG_SETJMP_SUPPORTED
-/* Restore jump buffer */
-png_memcpy(png_ptr->jmpbuf, tmp_jmp, png_sizeof(jmp_buf));
-#endif
-/* Added at libpng-1.2.6 */
-#ifdef PNG_SET_USER_LIMITS_SUPPORTED
-png_ptr->user_width_max=PNG_USER_WIDTH_MAX;
-png_ptr->user_height_max=PNG_USER_HEIGHT_MAX;
-#endif
-/* Initialize zbuf - compression buffer */
-png_ptr->zbuf_size = PNG_ZBUF_SIZE;
-png_ptr->zbuf = (png_bytep)png_malloc(png_ptr,
-(png_uint_32)png_ptr->zbuf_size);
-png_ptr->zstream.zalloc = png_zalloc;
-png_ptr->zstream.zfree = png_zfree;
-png_ptr->zstream.opaque = (voidpf)png_ptr;
-switch (inflateInit(&png_ptr->zstream))
-{
-case Z_OK: /* Do nothing */ break;
-case Z_MEM_ERROR:
-case Z_STREAM_ERROR: png_error(png_ptr, "zlib memory"); break;
-case Z_VERSION_ERROR: png_error(png_ptr, "zlib version"); break;
-default: png_error(png_ptr, "Unknown zlib error");
-}
-png_ptr->zstream.next_out = png_ptr->zbuf;
-png_ptr->zstream.avail_out = (uInt)png_ptr->zbuf_size;
-png_set_read_fn(png_ptr, png_voidp_NULL, png_rw_ptr_NULL);
-}
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
 /* Read the information before the actual image data.  This has been
 * changed in v0.90 to allow reading a file that already has the magic
 * bytes read from the stream.  You can tell libpng how many bytes have
 * been read from the beginning of the stream (up to the maximum of 8)
 * via png_set_sig_bytes(), and we will only check the remaining bytes
 * read if it is determined that this isn't a valid PNG file.
 */
 void PNGAPI
 png_read_info(png_structp png_ptr, png_infop info_ptr)
 {
+png_debug(1, "in png_read_info");
 if (png_ptr == NULL || info_ptr == NULL)
 return;
-png_debug(1, "in png_read_info");
 /* If we haven't checked all of the PNG signature bytes, do so now. */
 if (png_ptr->sig_bytes < 8)
 {
 png_size_t num_checked = png_ptr->sig_bytes,
 num_to_check = 8 - num_checked;
+#ifdef PNG_IO_STATE_SUPPORTED
+png_ptr->io_state = PNG_IO_READING | PNG_IO_SIGNATURE;
+#endif
 png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
 png_ptr->sig_bytes = 8;
 if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
 png_ptr->mode |= PNG_HAVE_PNG_SIGNATURE;
 }
 for (;;)
 {
-#ifdef PNG_USE_LOCAL_ARRAYS
+PNG_IHDR;
-PNG_CONST PNG_IHDR;
+PNG_IDAT;
-PNG_CONST PNG_IDAT;
+PNG_IEND;
-PNG_CONST PNG_IEND;
+PNG_PLTE;
-PNG_CONST PNG_PLTE;
+#ifdef PNG_READ_bKGD_SUPPORTED
-#if defined(PNG_READ_bKGD_SUPPORTED)
+PNG_bKGD;
-PNG_CONST PNG_bKGD;
+#endif
-#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
-#if defined(PNG_READ_cHRM_SUPPORTED)
+PNG_cHRM;
-PNG_CONST PNG_cHRM;
+#endif
-#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
-#if defined(PNG_READ_gAMA_SUPPORTED)
+PNG_gAMA;
-PNG_CONST PNG_gAMA;
+#endif
-#endif
+#ifdef PNG_READ_hIST_SUPPORTED
-#if defined(PNG_READ_hIST_SUPPORTED)
+PNG_hIST;
-PNG_CONST PNG_hIST;
+#endif
-#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
-#if defined(PNG_READ_iCCP_SUPPORTED)
+PNG_iCCP;
-PNG_CONST PNG_iCCP;
+#endif
-#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
-#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_iTXt;
-PNG_CONST PNG_iTXt;
+#endif
-#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
-#if defined(PNG_READ_oFFs_SUPPORTED)
+PNG_oFFs;
-PNG_CONST PNG_oFFs;
+#endif
-#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
-#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_pCAL;
-PNG_CONST PNG_pCAL;
+#endif
-#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
-#if defined(PNG_READ_pHYs_SUPPORTED)
+PNG_pHYs;
-PNG_CONST PNG_pHYs;
+#endif
-#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
-#if defined(PNG_READ_sBIT_SUPPORTED)
+PNG_sBIT;
-PNG_CONST PNG_sBIT;
+#endif
-#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
-#if defined(PNG_READ_sCAL_SUPPORTED)
+PNG_sCAL;
-PNG_CONST PNG_sCAL;
+#endif
-#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
-#if defined(PNG_READ_sPLT_SUPPORTED)
+PNG_sPLT;
-PNG_CONST PNG_sPLT;
+#endif
-#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
-#if defined(PNG_READ_sRGB_SUPPORTED)
+PNG_sRGB;
-PNG_CONST PNG_sRGB;
+#endif
-#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
-#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_tEXt;
-PNG_CONST PNG_tEXt;
+#endif
-#endif
+#ifdef PNG_READ_tIME_SUPPORTED
-#if defined(PNG_READ_tIME_SUPPORTED)
+PNG_tIME;
-PNG_CONST PNG_tIME;
+#endif
-#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
-#if defined(PNG_READ_tRNS_SUPPORTED)
+PNG_tRNS;
-PNG_CONST PNG_tRNS;
+#endif
-#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
-#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_zTXt;
-PNG_CONST PNG_zTXt;
+#endif
-#endif
-#endif /* PNG_USE_LOCAL_ARRAYS */
 png_uint_32 length = png_read_chunk_header(png_ptr);
 PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
 /* This should be a binary subdivision search or a hash for
 * matching the chunk name rather than a linear search.
 png_ptr->idat_size = length;
 png_ptr->mode |= PNG_HAVE_IDAT;
 break;
 }
-#if defined(PNG_READ_bKGD_SUPPORTED)
+#ifdef PNG_READ_bKGD_SUPPORTED
 else if (!png_memcmp(chunk_name, png_bKGD, 4))
 png_handle_bKGD(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_cHRM_SUPPORTED)
+#ifdef PNG_READ_cHRM_SUPPORTED
 else if (!png_memcmp(chunk_name, png_cHRM, 4))
 png_handle_cHRM(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_gAMA_SUPPORTED)
+#ifdef PNG_READ_gAMA_SUPPORTED
 else if (!png_memcmp(chunk_name, png_gAMA, 4))
 png_handle_gAMA(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_hIST_SUPPORTED)
+#ifdef PNG_READ_hIST_SUPPORTED
 else if (!png_memcmp(chunk_name, png_hIST, 4))
 png_handle_hIST(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_oFFs_SUPPORTED)
+#ifdef PNG_READ_oFFs_SUPPORTED
 else if (!png_memcmp(chunk_name, png_oFFs, 4))
 png_handle_oFFs(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_pCAL_SUPPORTED)
+#ifdef PNG_READ_pCAL_SUPPORTED
 else if (!png_memcmp(chunk_name, png_pCAL, 4))
 png_handle_pCAL(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sCAL_SUPPORTED)
+#ifdef PNG_READ_sCAL_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sCAL, 4))
 png_handle_sCAL(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_pHYs_SUPPORTED)
+#ifdef PNG_READ_pHYs_SUPPORTED
 else if (!png_memcmp(chunk_name, png_pHYs, 4))
 png_handle_pHYs(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sBIT_SUPPORTED)
+#ifdef PNG_READ_sBIT_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sBIT, 4))
 png_handle_sBIT(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sRGB_SUPPORTED)
+#ifdef PNG_READ_sRGB_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sRGB, 4))
 png_handle_sRGB(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_iCCP_SUPPORTED)
+#ifdef PNG_READ_iCCP_SUPPORTED
 else if (!png_memcmp(chunk_name, png_iCCP, 4))
 png_handle_iCCP(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sPLT_SUPPORTED)
+#ifdef PNG_READ_sPLT_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sPLT, 4))
 png_handle_sPLT(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_tEXt_SUPPORTED)
+#ifdef PNG_READ_tEXt_SUPPORTED
 else if (!png_memcmp(chunk_name, png_tEXt, 4))
 png_handle_tEXt(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_tIME_SUPPORTED)
+#ifdef PNG_READ_tIME_SUPPORTED
 else if (!png_memcmp(chunk_name, png_tIME, 4))
 png_handle_tIME(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_tRNS_SUPPORTED)
+#ifdef PNG_READ_tRNS_SUPPORTED
 else if (!png_memcmp(chunk_name, png_tRNS, 4))
 png_handle_tRNS(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_zTXt_SUPPORTED)
+#ifdef PNG_READ_zTXt_SUPPORTED
 else if (!png_memcmp(chunk_name, png_zTXt, 4))
 png_handle_zTXt(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_iTXt_SUPPORTED)
+#ifdef PNG_READ_iTXt_SUPPORTED
 else if (!png_memcmp(chunk_name, png_iTXt, 4))
 png_handle_iTXt(png_ptr, info_ptr, length);
 #endif
 else
 png_handle_unknown(png_ptr, info_ptr, length);
 }
 }
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
 /* Optional call to update the users info_ptr structure */
 void PNGAPI
 png_read_update_info(png_structp png_ptr, png_infop info_ptr)
 {
 png_debug(1, "in png_read_update_info");
 if (png_ptr == NULL)
 return;
 if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
 png_read_start_row(png_ptr);
 else
 png_warning(png_ptr,
 "Ignoring extra png_read_update_info() call; row buffer not reallocated");
 png_read_transform_info(png_ptr, info_ptr);
 }
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Initialize palette, background, etc, after transformations
 * are set, but before any reading takes place.  This allows
 * the user to obtain a gamma-corrected palette, for example.
 * If the user doesn't call this, we will do it ourselves.
 */
 void PNGAPI
 png_start_read_image(png_structp png_ptr)
 {
 png_debug(1, "in png_start_read_image");
 if (png_ptr == NULL)
 return;
 if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
 png_read_start_row(png_ptr);
 }
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 void PNGAPI
 png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
 {
-#ifdef PNG_USE_LOCAL_ARRAYS
+PNG_IDAT;
-PNG_CONST PNG_IDAT;
 PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
 0xff};
 PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
-#endif
 int ret;
 if (png_ptr == NULL)
 return;
 png_debug2(1, "in png_read_row (row %lu, pass %d)",
-png_ptr->row_number, png_ptr->pass);
+(unsigned long) png_ptr->row_number, png_ptr->pass);
 if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
 png_read_start_row(png_ptr);
 if (png_ptr->row_number == 0 && png_ptr->pass == 0)
 {
 /* Check for transforms that have been set but were defined out */
 #if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
 if (png_ptr->transformations & PNG_INVERT_MONO)
-png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
 #endif
 #if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
 if (png_ptr->transformations & PNG_FILLER)
-png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
 #endif
 #if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && !defined(PNG_READ_PACKSWAP_SUPPORTED)
 if (png_ptr->transformations & PNG_PACKSWAP)
-png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
 #endif
 #if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
 if (png_ptr->transformations & PNG_PACK)
-png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
 #endif
 #if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
 if (png_ptr->transformations & PNG_SHIFT)
-png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
 #endif
 #if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
 if (png_ptr->transformations & PNG_BGR)
-png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
 #endif
 #if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
 if (png_ptr->transformations & PNG_SWAP_BYTES)
-png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined.");
+png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
 #endif
 }
-#if defined(PNG_READ_INTERLACING_SUPPORTED)
+#ifdef PNG_READ_INTERLACING_SUPPORTED
 /* If interlaced and we do not need a new row, combine row and return */
 if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
 {
 switch (png_ptr->pass)
 {
 ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);
 if (ret == Z_STREAM_END)
 {
 if (png_ptr->zstream.avail_out || png_ptr->zstream.avail_in ||
 png_ptr->idat_size)
-png_error(png_ptr, "Extra compressed data");
+png_benign_error(png_ptr, "Extra compressed data");
 png_ptr->mode |= PNG_AFTER_IDAT;
 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
 break;
 }
 if (ret != Z_OK)
 if (png_ptr->row_buf[0])
 png_read_filter_row(png_ptr, &(png_ptr->row_info),
 png_ptr->row_buf + 1, png_ptr->prev_row + 1,
 (int)(png_ptr->row_buf[0]));
-png_memcpy_check(png_ptr, png_ptr->prev_row, png_ptr->row_buf,
+png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);
-png_ptr->rowbytes + 1);
+#ifdef PNG_MNG_FEATURES_SUPPORTED
-#if defined(PNG_MNG_FEATURES_SUPPORTED)
 if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
 (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
 {
 /* Intrapixel differencing */
 png_do_read_intrapixel(&(png_ptr->row_info), png_ptr->row_buf + 1);
 if (png_ptr->transformations || (png_ptr->flags&PNG_FLAG_STRIP_ALPHA))
 png_do_read_transformations(png_ptr);
-#if defined(PNG_READ_INTERLACING_SUPPORTED)
+#ifdef PNG_READ_INTERLACING_SUPPORTED
 /* Blow up interlaced rows to full size */
 if (png_ptr->interlaced &&
 (png_ptr->transformations & PNG_INTERLACE))
 {
 if (png_ptr->pass < 6)
 png_read_finish_row(png_ptr);
 if (png_ptr->read_row_fn != NULL)
 (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
 }
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read one or more rows of image data.  If the image is interlaced,
 * and png_set_interlace_handling() has been called, the rows need to
 * contain the contents of the rows from the previous pass.  If the
 * image has alpha or transparency, and png_handle_alpha()[*] has been
 * called, the rows contents must be initialized to the contents of the
 png_uint_32 i;
 png_bytepp rp;
 png_bytepp dp;
 png_debug(1, "in png_read_rows");
 if (png_ptr == NULL)
 return;
 rp = row;
 dp = display_row;
 if (rp != NULL && dp != NULL)
 }
 else if (rp != NULL)
 for (i = 0; i < num_rows; i++)
 {
 png_bytep rptr = *rp;
-png_read_row(png_ptr, rptr, png_bytep_NULL);
+png_read_row(png_ptr, rptr, NULL);
 rp++;
 }
 else if (dp != NULL)
 for (i = 0; i < num_rows; i++)
 {
 png_bytep dptr = *dp;
-png_read_row(png_ptr, png_bytep_NULL, dptr);
+png_read_row(png_ptr, NULL, dptr);
 dp++;
 }
 }
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the entire image.  If the image has an alpha channel or a tRNS
 * chunk, and you have called png_handle_alpha()[*], you will need to
 * initialize the image to the current image that PNG will be overlaying.
 * We set the num_rows again here, in case it was incorrectly set in
 * png_read_start_row() by a call to png_read_update_info() or
 png_uint_32 i, image_height;
 int pass, j;
 png_bytepp rp;
 png_debug(1, "in png_read_image");
 if (png_ptr == NULL)
 return;
 #ifdef PNG_READ_INTERLACING_SUPPORTED
 pass = png_set_interlace_handling(png_ptr);
 #else
 if (png_ptr->interlaced)
 png_error(png_ptr,
-"Cannot read interlaced image -- interlace handler disabled.");
+"Cannot read interlaced image -- interlace handler disabled");
 pass = 1;
 #endif
 image_height=png_ptr->height;
 for (j = 0; j < pass; j++)
 {
 rp = image;
 for (i = 0; i < image_height; i++)
 {
-png_read_row(png_ptr, *rp, png_bytep_NULL);
+png_read_row(png_ptr, *rp, NULL);
 rp++;
 }
 }
 }
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
 /* Read the end of the PNG file.  Will not read past the end of the
 * file, will verify the end is accurate, and will read any comments
 * or time information at the end of the file, if info is not NULL.
 */
 void PNGAPI
 png_read_end(png_structp png_ptr, png_infop info_ptr)
 {
 png_debug(1, "in png_read_end");
 if (png_ptr == NULL)
 return;
 png_crc_finish(png_ptr, 0); /* Finish off CRC from last IDAT chunk */
 do
 {
-#ifdef PNG_USE_LOCAL_ARRAYS
+PNG_IHDR;
-PNG_CONST PNG_IHDR;
+PNG_IDAT;
-PNG_CONST PNG_IDAT;
+PNG_IEND;
-PNG_CONST PNG_IEND;
+PNG_PLTE;
-PNG_CONST PNG_PLTE;
+#ifdef PNG_READ_bKGD_SUPPORTED
-#if defined(PNG_READ_bKGD_SUPPORTED)
+PNG_bKGD;
-PNG_CONST PNG_bKGD;
+#endif
-#endif
+#ifdef PNG_READ_cHRM_SUPPORTED
-#if defined(PNG_READ_cHRM_SUPPORTED)
+PNG_cHRM;
-PNG_CONST PNG_cHRM;
+#endif
-#endif
+#ifdef PNG_READ_gAMA_SUPPORTED
-#if defined(PNG_READ_gAMA_SUPPORTED)
+PNG_gAMA;
-PNG_CONST PNG_gAMA;
+#endif
-#endif
+#ifdef PNG_READ_hIST_SUPPORTED
-#if defined(PNG_READ_hIST_SUPPORTED)
+PNG_hIST;
-PNG_CONST PNG_hIST;
+#endif
-#endif
+#ifdef PNG_READ_iCCP_SUPPORTED
-#if defined(PNG_READ_iCCP_SUPPORTED)
+PNG_iCCP;
-PNG_CONST PNG_iCCP;
+#endif
-#endif
+#ifdef PNG_READ_iTXt_SUPPORTED
-#if defined(PNG_READ_iTXt_SUPPORTED)
+PNG_iTXt;
-PNG_CONST PNG_iTXt;
+#endif
-#endif
+#ifdef PNG_READ_oFFs_SUPPORTED
-#if defined(PNG_READ_oFFs_SUPPORTED)
+PNG_oFFs;
-PNG_CONST PNG_oFFs;
+#endif
-#endif
+#ifdef PNG_READ_pCAL_SUPPORTED
-#if defined(PNG_READ_pCAL_SUPPORTED)
+PNG_pCAL;
-PNG_CONST PNG_pCAL;
+#endif
-#endif
+#ifdef PNG_READ_pHYs_SUPPORTED
-#if defined(PNG_READ_pHYs_SUPPORTED)
+PNG_pHYs;
-PNG_CONST PNG_pHYs;
+#endif
-#endif
+#ifdef PNG_READ_sBIT_SUPPORTED
-#if defined(PNG_READ_sBIT_SUPPORTED)
+PNG_sBIT;
-PNG_CONST PNG_sBIT;
+#endif
-#endif
+#ifdef PNG_READ_sCAL_SUPPORTED
-#if defined(PNG_READ_sCAL_SUPPORTED)
+PNG_sCAL;
-PNG_CONST PNG_sCAL;
+#endif
-#endif
+#ifdef PNG_READ_sPLT_SUPPORTED
-#if defined(PNG_READ_sPLT_SUPPORTED)
+PNG_sPLT;
-PNG_CONST PNG_sPLT;
+#endif
-#endif
+#ifdef PNG_READ_sRGB_SUPPORTED
-#if defined(PNG_READ_sRGB_SUPPORTED)
+PNG_sRGB;
-PNG_CONST PNG_sRGB;
+#endif
-#endif
+#ifdef PNG_READ_tEXt_SUPPORTED
-#if defined(PNG_READ_tEXt_SUPPORTED)
+PNG_tEXt;
-PNG_CONST PNG_tEXt;
+#endif
-#endif
+#ifdef PNG_READ_tIME_SUPPORTED
-#if defined(PNG_READ_tIME_SUPPORTED)
+PNG_tIME;
-PNG_CONST PNG_tIME;
+#endif
-#endif
+#ifdef PNG_READ_tRNS_SUPPORTED
-#if defined(PNG_READ_tRNS_SUPPORTED)
+PNG_tRNS;
-PNG_CONST PNG_tRNS;
+#endif
-#endif
+#ifdef PNG_READ_zTXt_SUPPORTED
-#if defined(PNG_READ_zTXt_SUPPORTED)
+PNG_zTXt;
-PNG_CONST PNG_zTXt;
+#endif
-#endif
-#endif /* PNG_USE_LOCAL_ARRAYS */
 png_uint_32 length = png_read_chunk_header(png_ptr);
 PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
 if (!png_memcmp(chunk_name, png_IHDR, 4))
 png_handle_IHDR(png_ptr, info_ptr, length);
 else if (png_handle_as_unknown(png_ptr, chunk_name))
 {
 if (!png_memcmp(chunk_name, png_IDAT, 4))
 {
 if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-png_error(png_ptr, "Too many IDAT's found");
+png_benign_error(png_ptr, "Too many IDATs found");
 }
 png_handle_unknown(png_ptr, info_ptr, length);
 if (!png_memcmp(chunk_name, png_PLTE, 4))
 png_ptr->mode |= PNG_HAVE_PLTE;
 }
 {
 /* Zero length IDATs are legal after the last IDAT has been
 * read, but not after other chunks have been read.
 */
 if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
-png_error(png_ptr, "Too many IDAT's found");
+png_benign_error(png_ptr, "Too many IDATs found");
 png_crc_finish(png_ptr, length);
 }
 else if (!png_memcmp(chunk_name, png_PLTE, 4))
 png_handle_PLTE(png_ptr, info_ptr, length);
-#if defined(PNG_READ_bKGD_SUPPORTED)
+#ifdef PNG_READ_bKGD_SUPPORTED
 else if (!png_memcmp(chunk_name, png_bKGD, 4))
 png_handle_bKGD(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_cHRM_SUPPORTED)
+#ifdef PNG_READ_cHRM_SUPPORTED
 else if (!png_memcmp(chunk_name, png_cHRM, 4))
 png_handle_cHRM(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_gAMA_SUPPORTED)
+#ifdef PNG_READ_gAMA_SUPPORTED
 else if (!png_memcmp(chunk_name, png_gAMA, 4))
 png_handle_gAMA(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_hIST_SUPPORTED)
+#ifdef PNG_READ_hIST_SUPPORTED
 else if (!png_memcmp(chunk_name, png_hIST, 4))
 png_handle_hIST(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_oFFs_SUPPORTED)
+#ifdef PNG_READ_oFFs_SUPPORTED
 else if (!png_memcmp(chunk_name, png_oFFs, 4))
 png_handle_oFFs(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_pCAL_SUPPORTED)
+#ifdef PNG_READ_pCAL_SUPPORTED
 else if (!png_memcmp(chunk_name, png_pCAL, 4))
 png_handle_pCAL(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sCAL_SUPPORTED)
+#ifdef PNG_READ_sCAL_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sCAL, 4))
 png_handle_sCAL(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_pHYs_SUPPORTED)
+#ifdef PNG_READ_pHYs_SUPPORTED
 else if (!png_memcmp(chunk_name, png_pHYs, 4))
 png_handle_pHYs(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sBIT_SUPPORTED)
+#ifdef PNG_READ_sBIT_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sBIT, 4))
 png_handle_sBIT(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sRGB_SUPPORTED)
+#ifdef PNG_READ_sRGB_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sRGB, 4))
 png_handle_sRGB(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_iCCP_SUPPORTED)
+#ifdef PNG_READ_iCCP_SUPPORTED
 else if (!png_memcmp(chunk_name, png_iCCP, 4))
 png_handle_iCCP(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_sPLT_SUPPORTED)
+#ifdef PNG_READ_sPLT_SUPPORTED
 else if (!png_memcmp(chunk_name, png_sPLT, 4))
 png_handle_sPLT(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_tEXt_SUPPORTED)
+#ifdef PNG_READ_tEXt_SUPPORTED
 else if (!png_memcmp(chunk_name, png_tEXt, 4))
 png_handle_tEXt(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_tIME_SUPPORTED)
+#ifdef PNG_READ_tIME_SUPPORTED
 else if (!png_memcmp(chunk_name, png_tIME, 4))
 png_handle_tIME(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_tRNS_SUPPORTED)
+#ifdef PNG_READ_tRNS_SUPPORTED
 else if (!png_memcmp(chunk_name, png_tRNS, 4))
 png_handle_tRNS(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_zTXt_SUPPORTED)
+#ifdef PNG_READ_zTXt_SUPPORTED
 else if (!png_memcmp(chunk_name, png_zTXt, 4))
 png_handle_zTXt(png_ptr, info_ptr, length);
 #endif
-#if defined(PNG_READ_iTXt_SUPPORTED)
+#ifdef PNG_READ_iTXt_SUPPORTED
 else if (!png_memcmp(chunk_name, png_iTXt, 4))
 png_handle_iTXt(png_ptr, info_ptr, length);
 #endif
 else
 png_handle_unknown(png_ptr, info_ptr, length);
 } while (!(png_ptr->mode & PNG_HAVE_IEND));
 }
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
 /* Free all memory used by the read */
 void PNGAPI
 png_destroy_read_struct(png_structpp png_ptr_ptr, png_infopp info_ptr_ptr,
 png_infopp end_info_ptr_ptr)
 png_free_ptr free_fn = NULL;
 png_voidp mem_ptr = NULL;
 #endif
 png_debug(1, "in png_destroy_read_struct");
 if (png_ptr_ptr != NULL)
 png_ptr = *png_ptr_ptr;
 if (png_ptr == NULL)
 return;
 png_read_destroy(png_ptr, info_ptr, end_info_ptr);
 if (info_ptr != NULL)
 {
-#if defined(PNG_TEXT_SUPPORTED)
+#ifdef PNG_TEXT_SUPPORTED
 png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, -1);
 #endif
 #ifdef PNG_USER_MEM_SUPPORTED
 png_destroy_struct_2((png_voidp)info_ptr, (png_free_ptr)free_fn,
 *info_ptr_ptr = NULL;
 }
 if (end_info_ptr != NULL)
 {
-#if defined(PNG_READ_TEXT_SUPPORTED)
+#ifdef PNG_READ_TEXT_SUPPORTED
 png_free_data(png_ptr, end_info_ptr, PNG_FREE_TEXT, -1);
 #endif
 #ifdef PNG_USER_MEM_SUPPORTED
 png_destroy_struct_2((png_voidp)end_info_ptr, (png_free_ptr)free_fn,
 (png_voidp)mem_ptr);
 #ifdef PNG_USER_MEM_SUPPORTED
 png_free_ptr free_fn;
 #endif
 png_debug(1, "in png_read_destroy");
 if (info_ptr != NULL)
 png_info_destroy(png_ptr, info_ptr);
 if (end_info_ptr != NULL)
 png_info_destroy(png_ptr, end_info_ptr);
 png_free(png_ptr, png_ptr->zbuf);
 png_free(png_ptr, png_ptr->big_row_buf);
 png_free(png_ptr, png_ptr->prev_row);
 png_free(png_ptr, png_ptr->chunkdata);
-#if defined(PNG_READ_DITHER_SUPPORTED)
+#ifdef PNG_READ_DITHER_SUPPORTED
 png_free(png_ptr, png_ptr->palette_lookup);
 png_free(png_ptr, png_ptr->dither_index);
 #endif
-#if defined(PNG_READ_GAMMA_SUPPORTED)
+#ifdef PNG_READ_GAMMA_SUPPORTED
 png_free(png_ptr, png_ptr->gamma_table);
 #endif
-#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
 png_free(png_ptr, png_ptr->gamma_from_1);
 png_free(png_ptr, png_ptr->gamma_to_1);
 #endif
-#ifdef PNG_FREE_ME_SUPPORTED
 if (png_ptr->free_me & PNG_FREE_PLTE)
 png_zfree(png_ptr, png_ptr->palette);
 png_ptr->free_me &= ~PNG_FREE_PLTE;
-#else
-if (png_ptr->flags & PNG_FLAG_FREE_PLTE)
-png_zfree(png_ptr, png_ptr->palette);
-png_ptr->flags &= ~PNG_FLAG_FREE_PLTE;
-#endif
 #if defined(PNG_tRNS_SUPPORTED) || \
 defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
-#ifdef PNG_FREE_ME_SUPPORTED
 if (png_ptr->free_me & PNG_FREE_TRNS)
-png_free(png_ptr, png_ptr->trans);
+png_free(png_ptr, png_ptr->trans_alpha);
 png_ptr->free_me &= ~PNG_FREE_TRNS;
-#else
+#endif
-if (png_ptr->flags & PNG_FLAG_FREE_TRNS)
+#ifdef PNG_READ_hIST_SUPPORTED
-png_free(png_ptr, png_ptr->trans);
-png_ptr->flags &= ~PNG_FLAG_FREE_TRNS;
-#endif
-#endif
-#if defined(PNG_READ_hIST_SUPPORTED)
-#ifdef PNG_FREE_ME_SUPPORTED
 if (png_ptr->free_me & PNG_FREE_HIST)
 png_free(png_ptr, png_ptr->hist);
 png_ptr->free_me &= ~PNG_FREE_HIST;
-#else
+#endif
-if (png_ptr->flags & PNG_FLAG_FREE_HIST)
+#ifdef PNG_READ_GAMMA_SUPPORTED
-png_free(png_ptr, png_ptr->hist);
-png_ptr->flags &= ~PNG_FLAG_FREE_HIST;
-#endif
-#endif
-#if defined(PNG_READ_GAMMA_SUPPORTED)
 if (png_ptr->gamma_16_table != NULL)
 {
 int i;
 int istop = (1 << (8 - png_ptr->gamma_shift));
 for (i = 0; i < istop; i++)
 {
 png_free(png_ptr, png_ptr->gamma_16_table[i]);
 }
 png_free(png_ptr, png_ptr->gamma_16_table);
 }
-#if defined(PNG_READ_BACKGROUND_SUPPORTED)
+#ifdef PNG_READ_BACKGROUND_SUPPORTED
 if (png_ptr->gamma_16_from_1 != NULL)
 {
 int i;
 int istop = (1 << (8 - png_ptr->gamma_shift));
 for (i = 0; i < istop; i++)
 }
 png_free(png_ptr, png_ptr->gamma_16_to_1);
 }
 #endif
 #endif
-#if defined(PNG_TIME_RFC1123_SUPPORTED)
+#ifdef PNG_TIME_RFC1123_SUPPORTED
 png_free(png_ptr, png_ptr->time_buffer);
 #endif
 inflateEnd(&png_ptr->zstream);
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 return;
 png_ptr->read_row_fn = read_row_fn;
 }
-#ifndef PNG_NO_SEQUENTIAL_READ_SUPPORTED
+#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-#if defined(PNG_INFO_IMAGE_SUPPORTED)
+#ifdef PNG_INFO_IMAGE_SUPPORTED
 void PNGAPI
 png_read_png(png_structp png_ptr, png_infop info_ptr,
 int transforms,
 voidp params)
 {
 int row;
 if (png_ptr == NULL)
 return;
-#if defined(PNG_READ_INVERT_ALPHA_SUPPORTED)
-/* Invert the alpha channel from opacity to transparency
-*/
-if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
-png_set_invert_alpha(png_ptr);
-#endif
 /* png_read_info() gives us all of the information from the
 * PNG file before the first IDAT (image data chunk).
 */
 png_read_info(png_ptr, info_ptr);
 if (info_ptr->height > PNG_UINT_32_MAX/png_sizeof(png_bytep))
 png_error(png_ptr, "Image is too high to process with png_read_png()");
 /* -------------- image transformations start here ------------------- */
-#if defined(PNG_READ_16_TO_8_SUPPORTED)
+#ifdef PNG_READ_16_TO_8_SUPPORTED
 /* Tell libpng to strip 16 bit/color files down to 8 bits per color.
 */
 if (transforms & PNG_TRANSFORM_STRIP_16)
 png_set_strip_16(png_ptr);
 #endif
-#if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
+#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
 /* Strip alpha bytes from the input data without combining with
 * the background (not recommended).
 */
 if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
 png_set_strip_alpha(png_ptr);
 */
 if (transforms & PNG_TRANSFORM_PACKING)
 png_set_packing(png_ptr);
 #endif
-#if defined(PNG_READ_PACKSWAP_SUPPORTED)
+#ifdef PNG_READ_PACKSWAP_SUPPORTED
 /* Change the order of packed pixels to least significant bit first
 * (not useful if you are using png_set_packing).
 */
 if (transforms & PNG_TRANSFORM_PACKSWAP)
 png_set_packswap(png_ptr);
 #endif
-#if defined(PNG_READ_EXPAND_SUPPORTED)
+#ifdef PNG_READ_EXPAND_SUPPORTED
 /* Expand paletted colors into true RGB triplets
 * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel
 * Expand paletted or RGB images with transparency to full alpha
 * channels so the data will be available as RGBA quartets.
 */
 #endif
 /* We don't handle background color or gamma transformation or dithering.
 */
-#if defined(PNG_READ_INVERT_SUPPORTED)
+#ifdef PNG_READ_INVERT_SUPPORTED
 /* Invert monochrome files to have 0 as white and 1 as black
 */
 if (transforms & PNG_TRANSFORM_INVERT_MONO)
 png_set_invert_mono(png_ptr);
 #endif
-#if defined(PNG_READ_SHIFT_SUPPORTED)
+#ifdef PNG_READ_SHIFT_SUPPORTED
 /* If you want to shift the pixel values from the range [0,255] or
 * [0,65535] to the original [0,7] or [0,31], or whatever range the
 * colors were originally in:
 */
 if ((transforms & PNG_TRANSFORM_SHIFT)
 png_get_sBIT(png_ptr, info_ptr, &sig_bit);
 png_set_shift(png_ptr, sig_bit);
 }
 #endif
-#if defined(PNG_READ_BGR_SUPPORTED)
+#ifdef PNG_READ_BGR_SUPPORTED
 /* Flip the RGB pixels to BGR (or RGBA to BGRA)
 */
 if (transforms & PNG_TRANSFORM_BGR)
 png_set_bgr(png_ptr);
 #endif
-#if defined(PNG_READ_SWAP_ALPHA_SUPPORTED)
+#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
 /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR)
 */
 if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
 png_set_swap_alpha(png_ptr);
 #endif
-#if defined(PNG_READ_SWAP_SUPPORTED)
+#ifdef PNG_READ_SWAP_SUPPORTED
 /* Swap bytes of 16 bit files to least significant byte first
 */
 if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
 png_set_swap(png_ptr);
+#endif
+/* Added at libpng-1.2.41 */
+#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
+/* Invert the alpha channel from opacity to transparency
+*/
+if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+png_set_invert_alpha(png_ptr);
+#endif
+/* Added at libpng-1.2.41 */
+#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
+/* Expand grayscale image to RGB
+*/
+if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
+png_set_gray_to_rgb(png_ptr);
 #endif
 /* We don't handle adding filler bytes */
 /* Optional call to gamma correct and add the background to the palette
 */
 png_read_update_info(png_ptr, info_ptr);
 /* -------------- image transformations end here ------------------- */
-#ifdef PNG_FREE_ME_SUPPORTED
 png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
-#endif
 if (info_ptr->row_pointers == NULL)
 {
+png_uint_32 iptr;
 info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
 info_ptr->height * png_sizeof(png_bytep));
-png_memset(info_ptr->row_pointers, 0, info_ptr->height
+for (iptr=0; iptr<info_ptr->height; iptr++)
-* png_sizeof(png_bytep));
+info_ptr->row_pointers[iptr] = NULL;
-#ifdef PNG_FREE_ME_SUPPORTED
 info_ptr->free_me |= PNG_FREE_ROWS;
-#endif
 for (row = 0; row < (int)info_ptr->height; row++)
 info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
 png_get_rowbytes(png_ptr, info_ptr));
 }
 transforms = transforms; /* Quiet compiler warnings */
 params = params;
 }
 #endif /* PNG_INFO_IMAGE_SUPPORTED */
-#endif /* PNG_NO_SEQUENTIAL_READ_SUPPORTED */
+#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
 #endif /* PNG_READ_SUPPORTED */

changeset 30	5dc02b23752f
parent 0	1918ee327afb