From a845cca0373b322082ec54c71288137746c31b43 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 29 Apr 2010 10:43:23 -0500 Subject: [PATCH] [master] Corrected protection of png_get_user_transform_ptr. The API declaration in png.h is removed if both READ and WRITE USER_TRANSFORM are turned off but was left defined in pngtrans.c --- ANNOUNCE | 3 +++ CHANGES | 3 +++ pngtrans.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE index b9458b2c5..a37ed77de 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -56,6 +56,9 @@ version 1.4.2rc05 [April 29, 2010] Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED in gregbook/readpng2.c + Corrected protection of png_get_user_transform_ptr. The API declaration in + png.h is removed if both READ and WRITE USER_TRANSFORM are turned off + but was left defined in pngtrans.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 77bad2806..8cc074077 100644 --- a/CHANGES +++ b/CHANGES @@ -2567,6 +2567,9 @@ version 1.4.2rc05 [April 29, 2010] Removed dummy_inflate.c and uncompr.c from contrib/pngminim/encoder Corrected PNG_UNKNOWN_CHUNKS_SUPPORTED to PNG_HANDLE_AS_UNKNOWN_SUPPORTED in gregbook/readpng2.c + Corrected protection of png_get_user_transform_ptr. The API declaration in + png.h is removed if both READ and WRITE USER_TRANSFORM are turned off + but was left defined in pngtrans.c Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngtrans.c b/pngtrans.c index 7b217bb3b..1d220e29b 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -655,7 +655,6 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp "This version of libpng does not support user transform info"); #endif } -#endif /* This function returns a pointer to the user_transform_ptr associated with * the user transform functions. The application should free any memory @@ -673,4 +672,6 @@ png_get_user_transform_ptr(png_structp png_ptr) return (NULL); #endif } +#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED || + PNG_WRITE_USER_TRANSFORM_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */