[devel] Made PNG_READ_16_TO_8_ACCURATE_SCALE configurable again.

If this is not enabled, png_set_strip_16() and png_do_scale_16_to_8()
aren't built.
This commit is contained in:
Glenn Randers-Pehrson
2011-06-16 09:05:40 -05:00
parent 733b131545
commit 5f0b9276ec
9 changed files with 39 additions and 22 deletions

14
png.h
View File

@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.5.4beta04 - June 15, 2011
* libpng version 1.5.4beta04 - June 16, 2011
* Copyright (c) 1998-2011 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.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.5.4beta04 - June 15, 2011: Glenn
* libpng versions 0.97, January 1998, through 1.5.4beta04 - June 16, 2011: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -186,7 +186,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.4beta04, June 15, 2011, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.4beta04, June 16, 2011, are
* Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@@ -298,7 +298,7 @@
* Y2K compliance in libpng:
* =========================
*
* June 15, 2011
* June 16, 2011
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -361,7 +361,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.4beta04"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.4beta04 - June 15, 2011\n"
" libpng version 1.5.4beta04 - June 16, 2011\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@@ -1424,10 +1424,10 @@ PNG_FIXED_EXPORT(215, void, png_set_background_fixed, (png_structp png_ptr,
#endif
#ifdef PNG_READ_16_TO_8_SUPPORTED
/* The following is always done from 1.5.4: */
#define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
# ifdef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
/* Scale a 16-bit depth file down to 8-bit, accurately. */
PNG_EXPORT(48, void, png_set_strip_16, (png_structp png_ptr));
# endif
# ifdef PNG_READ_CHOP_16_TO_8_SUPPORTED
/* Strip the second byte of information from a 16-bit depth file. */
PNG_EXPORT(229, void, png_set_chop_16, (png_structp png_ptr));