[devel] Fixed more inconsistent indentation in the header files.

This commit is contained in:
Glenn Randers-Pehrson 2010-03-06 11:39:29 -06:00
parent d4df36c7f0
commit e8b1aa0c5a
3 changed files with 353 additions and 347 deletions

23
png.h
View File

@ -1565,25 +1565,28 @@ extern PNG_EXPORT(png_uint_32,png_get_cHRM) PNGARG((png_structp png_ptr,
# endif
# ifdef PNG_FIXED_POINT_SUPPORTED
extern PNG_EXPORT(png_uint_32,png_get_cHRM_fixed) PNGARG((png_structp png_ptr,
png_infop info_ptr, png_fixed_point *int_white_x, png_fixed_point
*int_white_y, png_fixed_point *int_red_x, png_fixed_point *int_red_y,
png_fixed_point *int_green_x, png_fixed_point *int_green_y, png_fixed_point
*int_blue_x, png_fixed_point *int_blue_y));
png_infop info_ptr,
png_fixed_point *int_white_x, png_fixed_point *int_white_y,
png_fixed_point *int_red_x, png_fixed_point *int_red_y,
png_fixed_point *int_green_x, png_fixed_point *int_green_y,
png_fixed_point *int_blue_x, png_fixed_point *int_blue_y));
# endif
#endif
#ifdef PNG_cHRM_SUPPORTED
# ifdef PNG_FLOATING_POINT_SUPPORTED
extern PNG_EXPORT(void,png_set_cHRM) PNGARG((png_structp png_ptr,
png_infop info_ptr, double white_x, double white_y, double red_x,
double red_y, double green_x, double green_y, double blue_x, double blue_y));
png_infop info_ptr, double white_x, double white_y,
double red_x, double red_y, double green_x, double green_y,
double blue_x, double blue_y));
# endif
# ifdef PNG_FIXED_POINT_SUPPORTED
extern PNG_EXPORT(void,png_set_cHRM_fixed) PNGARG((png_structp png_ptr,
png_infop info_ptr, png_fixed_point int_white_x, png_fixed_point int_white_y,
png_fixed_point int_red_x, png_fixed_point int_red_y, png_fixed_point
int_green_x, png_fixed_point int_green_y, png_fixed_point int_blue_x,
png_fixed_point int_blue_y));
png_infop info_ptr,
png_fixed_point int_white_x, png_fixed_point int_white_y,
png_fixed_point int_red_x, png_fixed_point int_red_y,
png_fixed_point int_green_x, png_fixed_point int_green_y,
png_fixed_point int_blue_x, png_fixed_point int_blue_y));
# endif
#endif

View File

@ -71,7 +71,7 @@
#ifdef __STDC__
# ifdef SPECIALBUILD
# pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
# pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD) \
are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")
# endif
@ -162,7 +162,7 @@
#endif
/* Added at libpng-1.4.0beta49 for testing (this test is no longer used
in libpng and png_calloc() is always present)
* in libpng and png_calloc() is always present)
*/
#define PNG_CALLOC_SUPPORTED
@ -374,7 +374,6 @@
* being called to fill in the gamma tables. Don't set this value
* less then 8, and even that may not work (I haven't tested it).
*/
#ifndef PNG_MAX_GAMMA_8
# define PNG_MAX_GAMMA_8 11
#endif
@ -390,7 +389,6 @@
* and warning message functions, so some compilers won't complain.
* If you do not want to use const, define PNG_NO_CONST here.
*/
#ifndef PNG_CONST
# ifndef PNG_NO_CONST
# define PNG_CONST const
@ -499,14 +497,16 @@
# endif
# endif /* PNG_READ_TRANSFORMS_SUPPORTED */
/* PNG_PROGRESSIVE_READ_NOT_SUPPORTED is deprecated. */
# if !defined(PNG_NO_PROGRESSIVE_READ) && \
!defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED) /* if you don't do progressive */
# define PNG_PROGRESSIVE_READ_SUPPORTED /* reading. This is not talking */
# endif /* about interlacing capability! You'll */
/* still have interlacing unless you change the following define: */
# ifndef PNG_NO_PROGRESSIVE_READ
# define PNG_PROGRESSIVE_READ_SUPPORTED
# endif
/* You can define PNG_NO_PROGRESSIVE_READ if you don't do progressive reading.
* This is not talking about interlacing capability! You'll still have
* interlacing unless you change the following define which is required
* for PNG-compliant decoders:
*/
# define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
# define PNG_READ_INTERLACING_SUPPORTED
/* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */
# if !defined(PNG_NO_SEQUENTIAL_READ) && \
@ -517,7 +517,8 @@
# ifndef PNG_NO_READ_COMPOSITE_NODIV
# ifndef PNG_NO_READ_COMPOSITED_NODIV /* libpng-1.0.x misspelling */
# define PNG_READ_COMPOSITE_NODIV_SUPPORTED /* well tested on Intel, SGI */
/* well tested on Intel, SGI */
# define PNG_READ_COMPOSITE_NODIV_SUPPORTED
# endif
# endif
@ -700,7 +701,7 @@
/* These are currently experimental features, define them if you want */
/* Very little testing */
/* Very little testing, not enabled by default. */
/*
#ifdef PNG_READ_SUPPORTED
# ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
@ -710,7 +711,7 @@
*/
/* This is only for PowerPC big-endian and 680x0 systems */
/* some testing */
/* some testing, not enabled by default. */
/*
#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
# define PNG_READ_BIG_ENDIAN_SUPPORTED
@ -984,7 +985,8 @@
# define PNG_zTXt_SUPPORTED
# endif
# endif
# if defined(PNG_WRITE_iTXt_SUPPORTED) || defined(PNG_WRITE_tEXt_SUPPORTED) || \
# if defined(PNG_WRITE_iTXt_SUPPORTED) || \
defined(PNG_WRITE_tEXt_SUPPORTED) || \
defined(PNG_WRITE_zTXt_SUPPORTED)
# define PNG_WRITE_TEXT_SUPPORTED
# ifndef PNG_TEXT_SUPPORTED
@ -1125,7 +1127,8 @@ typedef unsigned char png_byte;
#endif
/* Typedef for floating-point numbers that are converted
to fixed-point with a multiple of 100,000, e.g., int_gamma */
* to fixed-point with a multiple of 100,000, e.g., int_gamma
*/
typedef png_int_32 png_fixed_point;
/* Add typedefs for pointers */