From acb4822f6b100f85349cf715de1348f0310dc2db Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 9 Dec 2010 06:43:24 -0600 Subject: [PATCH] [master] Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h and some cosmetic changes to some source files. --- ANNOUNCE | 3 +++ CHANGES | 3 +++ png.c | 2 +- pngget.c | 14 +++++++------- pngpread.c | 2 +- pngrutil.c | 2 +- pngset.c | 8 ++++---- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index ed8e91b11..57d61f0f4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -80,6 +80,9 @@ version 1.4.5rc02 [December 2, 2010] version 1.4.5rc03 [December 3, 2010] Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions. +version 1.4.5rc04 [December 8, 2010] + Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h + Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/CHANGES b/CHANGES index 0829b07ff..f3d99c770 100644 --- a/CHANGES +++ b/CHANGES @@ -2732,6 +2732,9 @@ version 1.4.5rc02 [December 2, 2010] version 1.4.5rc03 [December 3, 2010] Added missing vstudio/*/*.vcxproj files to the zip and 7z distributions. +version 1.4.5rc04 [December 8, 2010] + Removed PNG_NO_WRITE_GAMMA from pngminim/encoder/pngusr.h + Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement). diff --git a/png.c b/png.c index 3045d735e..dac9c0171 100644 --- a/png.c +++ b/png.c @@ -674,7 +674,7 @@ png_convert_size(size_t size) */ void /* PRIVATE */ -png_64bit_product (long v1, long v2, unsigned long *hi_product, +png_64bit_product(long v1, long v2, unsigned long *hi_product, unsigned long *lo_product) { int a, b, c, d; diff --git a/pngget.c b/pngget.c index abe721bd5..9b3a9ccee 100644 --- a/pngget.c +++ b/pngget.c @@ -858,7 +858,7 @@ png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr, #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED png_byte PNGAPI -png_get_rgb_to_gray_status (png_structp png_ptr) +png_get_rgb_to_gray_status(png_structp png_ptr) { return (png_byte)(png_ptr? png_ptr->rgb_to_gray_status : 0); } @@ -883,24 +883,24 @@ png_get_compression_buffer_size(png_structp png_ptr) /* These functions were added to libpng 1.2.6 and were enabled * by default in libpng-1.4.0 */ png_uint_32 PNGAPI -png_get_user_width_max (png_structp png_ptr) +png_get_user_width_max(png_structp png_ptr) { return (png_ptr? png_ptr->user_width_max : 0); } png_uint_32 PNGAPI -png_get_user_height_max (png_structp png_ptr) +png_get_user_height_max(png_structp png_ptr) { return (png_ptr? png_ptr->user_height_max : 0); } /* This function was added to libpng 1.4.0 */ png_uint_32 PNGAPI -png_get_chunk_cache_max (png_structp png_ptr) +png_get_chunk_cache_max(png_structp png_ptr) { return (png_ptr? png_ptr->user_chunk_cache_max : 0); } /* This function was added to libpng 1.4.1 */ png_alloc_size_t PNGAPI -png_get_chunk_malloc_max (png_structp png_ptr) +png_get_chunk_malloc_max(png_structp png_ptr) { return (png_ptr? png_ptr->user_chunk_malloc_max : 0); @@ -910,13 +910,13 @@ png_get_chunk_malloc_max (png_structp png_ptr) /* These functions were added to libpng 1.4.0 */ #ifdef PNG_IO_STATE_SUPPORTED png_uint_32 PNGAPI -png_get_io_state (png_structp png_ptr) +png_get_io_state(png_structp png_ptr) { return png_ptr->io_state; } png_bytep PNGAPI -png_get_io_chunk_name (png_structp png_ptr) +png_get_io_chunk_name(png_structp png_ptr) { return png_ptr->chunk_name; } diff --git a/pngpread.c b/pngpread.c index d73598981..9c69a89d1 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1728,7 +1728,7 @@ png_push_have_row(png_structp png_ptr, png_bytep row) } void PNGAPI -png_progressive_combine_row (png_structp png_ptr, +png_progressive_combine_row(png_structp png_ptr, png_bytep old_row, png_bytep new_row) { PNG_CONST int FARDATA png_pass_dsp_mask[7] = diff --git a/pngrutil.c b/pngrutil.c index d09285f2f..a0008932f 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -66,7 +66,7 @@ png_get_int_32)(png_bytep buf) /* Grab an unsigned 16-bit integer from a buffer in big-endian format. */ png_uint_16 (PNGAPI -png_get_uint_16) (png_bytep buf) +png_get_uint_16)(png_bytep buf) { /* ANSI-C requires an int value to accomodate at least 16 bits so this * works and allows the compiler not to worry about possible narrowing diff --git a/pngset.c b/pngset.c index 7ff0707b8..e3faac4ff 100644 --- a/pngset.c +++ b/pngset.c @@ -1011,7 +1011,7 @@ png_set_unknown_chunk_location(png_structp png_ptr, png_infop info_ptr, #ifdef PNG_MNG_FEATURES_SUPPORTED png_uint_32 PNGAPI -png_permit_mng_features (png_structp png_ptr, png_uint_32 mng_features) +png_permit_mng_features(png_structp png_ptr, png_uint_32 mng_features) { png_debug(1, "in png_permit_mng_features"); @@ -1125,7 +1125,7 @@ png_set_invalid(png_structp png_ptr, png_infop info_ptr, int mask) #ifdef PNG_SET_USER_LIMITS_SUPPORTED /* This function was added to libpng 1.2.6 */ void PNGAPI -png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max, +png_set_user_limits(png_structp png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max) { /* Images with dimensions larger than these limits will be @@ -1140,7 +1140,7 @@ png_set_user_limits (png_structp png_ptr, png_uint_32 user_width_max, /* This function was added to libpng 1.4.0 */ void PNGAPI -png_set_chunk_cache_max (png_structp png_ptr, +png_set_chunk_cache_max(png_structp png_ptr, png_uint_32 user_chunk_cache_max) { if (png_ptr) @@ -1149,7 +1149,7 @@ png_set_chunk_cache_max (png_structp png_ptr, /* This function was added to libpng 1.4.1 */ void PNGAPI -png_set_chunk_malloc_max (png_structp png_ptr, +png_set_chunk_malloc_max(png_structp png_ptr, png_alloc_size_t user_chunk_malloc_max) { if (png_ptr)