[master] Imported from libpng-1.2.41beta13.tar

This commit is contained in:
Glenn Randers-Pehrson
2009-11-03 06:50:18 -06:00
parent d4ebb803fa
commit fd3d717df5
26 changed files with 52 additions and 52 deletions

View File

@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.2.41 [November 2, 2009]
* Last changed in libpng 1.2.41 [November 3, 2009]
* Copyright (c) 1998-2009 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.)
@@ -146,7 +146,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
png_error(png_ptr,
"Incompatible libpng version in application and library");
}
#ifdef PNG_iTXt_SUPPORTED
/* Any library mismatch is trouble for png_set_read() in
* libpng-1.2.41 and later 1.2.x, so we store the caller's
@@ -166,7 +166,6 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
png_memcpy(png_ptr->user_png_ver, user_png_ver, length);
#endif /* PNG_iTXt_SUPPORTED */
}
/* Initialize zbuf - compression buffer */