diff --git a/ANNOUNCE b/ANNOUNCE index 47f7b0974..647342693 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.0alpha01 - December 14, 2009 +Libpng 1.5.0alpha01 - December 22, 2009 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -55,9 +55,12 @@ version 1.4.1alpha02 [December 11, 2009] change in version 1.2.41beta08 caused transparency to be handled wrong in some 16-bit datastreams (Yusaku Sugai). -version 1.5.0alpha01 [December 14, 2009] +version 1.5.0alpha01 [December 22, 2009] Bump version to 1.5.0alpha01 Add "depth" parameter to private png_build_gamma_table() + Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c + Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt + (revising the change in 1.4.0beta99) Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 619b94acb..a519ece6d 100644 --- a/CHANGES +++ b/CHANGES @@ -2437,9 +2437,13 @@ version 1.4.1alpha02 [December 11, 2009] change in version 1.2.41beta08 caused transparency to be handled wrong in some 16-bit datastreams (Yusaku Sugai). -version 1.5.0alpha01 [December 14, 2009] +version 1.5.0alpha01 [December 22, 2009] Bump version to 1.5.0alpha01 Add "depth" parameter to private png_build_gamma_table() + Declared png_cleanup_needed "volatile" in pngread.c and pngwrite.c + Renamed libpng-pc.in back to libpng.pc.in and revised CMakeLists.txt + (revising the change in 1.4.0beta99) + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 16a991147..72befe005 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,11 +191,11 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) set(includedir ${CMAKE_INSTALL_PREFIX}/include) -configure_file(${PNG_SOURCE_DIR}/libpng-pc.in +configure_file(${PNG_SOURCE_DIR}/libpng.pc.in ${PNG_BINARY_DIR}/libpng.pc) configure_file(${PNG_SOURCE_DIR}/libpng-config.in ${PNG_BINARY_DIR}/libpng-config) -configure_file(${PNG_SOURCE_DIR}/libpng-pc.in +configure_file(${PNG_SOURCE_DIR}/libpng.pc.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}.pc) configure_file(${PNG_SOURCE_DIR}/libpng-config.in ${PNG_BINARY_DIR}/${PNGLIB_NAME}-config) diff --git a/libpng-1.5.0alpha01.txt b/libpng-1.5.0alpha01.txt index de2a1f15a..506f1c13b 100644 --- a/libpng-1.5.0alpha01.txt +++ b/libpng-1.5.0alpha01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.5.0alpha01 - December 12, 2009 + libpng version 1.5.0alpha01 - December 22, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.0alpha01 - December 12, 2009 + libpng versions 0.97, January 1998, through 1.5.0alpha01 - December 22, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -3019,7 +3019,13 @@ Support for global arrays was removed. Some obsolete/deprecated macros and functions have been removed. -The obsolete, unused pnggccrd.c and pngvcrd.files were removed. +Typecasted NULL definitions such as + #define png_voidp_NULL (png_voidp)NULL +were eliminated. If you used these in your application, just use +NULL instead. + +The obsolete, unused pnggccrd.c and pngvcrd.c files and related makefiles +%were removed. The PNG_1_0_X and PNG_1_2_X macros were eliminated. @@ -3042,9 +3048,6 @@ after the png_malloc() to set the pointers to NULL. We added PNG_TRANSFORM_GRAY_TO_RGB to the available high-level input transforms. -We added the png_set_premultiply_alpha and -png_do_read_premultiply_alpha() functions. - The call to png_do_chop() in pngrtran.c, which reduces 16-bit input files to 8-bit bit depth, was relocated ahead of the building of gamma tables. This allows us to build 8-bit tables instead @@ -3096,7 +3099,12 @@ We removed the trailing '.' from the warning and error messages. The png_struct and info_struct members "trans" and "trans_values" were changed to "trans_alpha" and "trans_color", respectively. -X. Detecting libpng +X. Changes to Libpng from version 1.4.x to 1.5.x + +We added the png_set_premultiply_alpha and +png_do_read_premultiply_alpha() functions. + +XI. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never changed, and is unaffected by conditional compilation macros. It is the @@ -3105,7 +3113,7 @@ libpng version since 0.88. In an autoconf "configure.in" you could use AC_CHECK_LIB(png, png_get_io_ptr, ... -XI. Source code repository +XII. Source code repository Since about February 2009, version 1.2.34, libpng has been under "git" source control. The git repository was built from old libpng-x.y.z.tar.gz files @@ -3124,7 +3132,7 @@ the libpng bug tracker at http://libpng.sourceforge.net -XII. Coding style +XIII. Coding style Our coding style is similar to the "Allman" style, with curly braces on separate lines: @@ -3228,11 +3236,13 @@ when there is only one macro being tested. We do not use the TAB character for indentation in the C sources. +Lines do not exceed 80 characters. + Other rules can be inferred by inspecting the libpng source. -XIII. Y2K Compliance in libpng +XIV. Y2K Compliance in libpng -December 12, 2009 +December 22, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng-pc.in b/libpng.pc.in similarity index 100% rename from libpng-pc.in rename to libpng.pc.in diff --git a/pngread.c b/pngread.c index 81237e7c1..c062c2401 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.0 [December 12, 2009] + * Last changed in libpng 1.4.0 [December 22, 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.) @@ -43,7 +43,7 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr, volatile #endif png_structp png_ptr; - int png_cleanup_needed = 0; + volatile int png_cleanup_needed = 0; #ifdef PNG_SETJMP_SUPPORTED #ifdef USE_FAR_KEYWORD diff --git a/pngwrite.c b/pngwrite.c index 22f83e9ee..d1e5f74ee 100644 --- a/pngwrite.c +++ b/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [December 12, 2009] + * Last changed in libpng 1.4.0 [December 22, 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.) @@ -468,7 +468,7 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn) { #endif /* PNG_USER_MEM_SUPPORTED */ - int png_cleanup_needed = 0; + volatile int png_cleanup_needed = 0; #ifdef PNG_SETJMP_SUPPORTED volatile #endif