diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2008-03-01 06:37:33 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2008-03-01 06:37:33 +0000 |
| commit | 023ddf39ba5ef44cc5ef1084206f8c3eb482bef4 (patch) | |
| tree | da5c9c01f0d33333768f879a496bfd4fbad95c31 /png/pngtrans.c | |
| parent | 27147a02c42d57520f64473b36e125b42e3b17f1 (diff) | |
Update libpng to 1.2.26.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@6060 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'png/pngtrans.c')
| -rw-r--r-- | png/pngtrans.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/png/pngtrans.c b/png/pngtrans.c index 25f42c871..164009502 100644 --- a/png/pngtrans.c +++ b/png/pngtrans.c @@ -1,9 +1,9 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.2.13 November 13, 2006 + * Last changed in libpng 1.2.17 May 15, 2007 * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2006 Glenn Randers-Pehrson + * Copyright (c) 1998-2007 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.) */ @@ -652,10 +652,11 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp png_voidp PNGAPI png_get_user_transform_ptr(png_structp png_ptr) { - if (png_ptr == NULL) return (NULL); #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) + if (png_ptr == NULL) return (NULL); return ((png_voidp)png_ptr->user_transform_ptr); -#endif +#else return (NULL); +#endif } #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ |