diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2008-12-17 18:57:18 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2008-12-17 18:57:18 +0000 |
| commit | 3db04d80a1f8dd7d38e0a94afb1a24a87ff35263 (patch) | |
| tree | 587b7f6467e73ee079866f51b55a46f15e88fa41 /png/pngtrans.c | |
| parent | 63b8523126af6b90ecb6d26feb14075663f3a233 (diff) | |
Updated the bundled libpng to v1.2.33.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6592 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'png/pngtrans.c')
| -rw-r--r-- | png/pngtrans.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/png/pngtrans.c b/png/pngtrans.c index 4527b24d4..85f6a71f3 100644 --- a/png/pngtrans.c +++ b/png/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.2.17 May 15, 2007 + * Last changed in libpng 1.2.30 [August 15, 2008] * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2008 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -10,8 +10,8 @@ #define PNG_INTERNAL #include "png.h" - #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) + #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED) /* turn on BGR-to-RGB mapping */ void PNGAPI @@ -652,8 +652,8 @@ png_set_user_transform_info(png_structp png_ptr, png_voidp png_voidp PNGAPI png_get_user_transform_ptr(png_structp png_ptr) { -#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) if (png_ptr == NULL) return (NULL); +#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) return ((png_voidp)png_ptr->user_transform_ptr); #else return (NULL); |