From 3db04d80a1f8dd7d38e0a94afb1a24a87ff35263 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 17 Dec 2008 18:57:18 +0000 Subject: 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 --- png/png.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'png/png.c') diff --git a/png/png.c b/png/png.c index e07acff8a..2e9adf909 100644 --- a/png/png.c +++ b/png/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.21 October 4, 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) @@ -13,7 +13,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_25 Your_png_h_is_not_version_1_2_25; +typedef version_1_2_33 Your_png_h_is_not_version_1_2_33; /* Version information for C files. This had better match the version * string defined in png.h. */ @@ -380,11 +380,11 @@ if ((mask & PNG_FREE_TRNS) && (png_ptr->flags & PNG_FLAG_FREE_TRNS)) #endif { png_free(png_ptr, info_ptr->trans); + info_ptr->trans = NULL; info_ptr->valid &= ~PNG_INFO_tRNS; #ifndef PNG_FREE_ME_SUPPORTED png_ptr->flags &= ~PNG_FLAG_FREE_TRNS; #endif - info_ptr->trans = NULL; } #endif @@ -490,6 +490,7 @@ if (mask & PNG_FREE_SPLT) png_free(png_ptr, png_ptr->unknown_chunk.data); png_ptr->unknown_chunk.data = NULL; } + #ifdef PNG_FREE_ME_SUPPORTED if ((mask & PNG_FREE_UNKN) & info_ptr->free_me) #else @@ -693,7 +694,7 @@ png_charp PNGAPI png_get_copyright(png_structp png_ptr) { png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */ - return ((png_charp) "\n libpng version 1.2.25 - February 18, 2008\n\ + return ((png_charp) "\n libpng version 1.2.33 - October 31, 2008\n\ Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\ Copyright (c) 1996-1997 Andreas Dilger\n\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n"); -- cgit v1.2.3