cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Make PNG_DEPSTRUCT, etc., configurable.

Browse Source 
Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.
This commit is contained in:
Glenn Randers-Pehrson 2009-11-08 20:36:28 -06:00
parent 013d1d68c0
commit 44db6e39c3
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.4.0beta94 - November 8, 2009 Libpng 1.4.0beta94 - November 9, 2009
This is not intended to be a public release. It will be replaced 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. within a few weeks by a public version or by another test version.
@ -634,10 +634,11 @@ version 1.4.0beta93 [November 7, 2009]
Moved the synopsis lines for png_read_destroy(), png_write_destroy() Moved the synopsis lines for png_read_destroy(), png_write_destroy()
png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3. png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.
version 1.4.0beta94 [November 8, 2009] version 1.4.0beta94 [November 9, 2009]
Removed the obsolete, unused pnggccrd.c and pngvcrd.c files. Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.
Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions. Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.
Removed dependency of pngtest.o on pngpriv.h in the makefiles. Removed dependency of pngtest.o on pngpriv.h in the makefiles.
Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -2320,10 +2320,11 @@ version 1.4.0beta93 [November 7, 2009]
Moved the synopsis lines for png_read_destroy(), png_write_destroy() Moved the synopsis lines for png_read_destroy(), png_write_destroy()
png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3. png_debug(), png_debug1(), and png_debug2() from libpng.3 to libpngpf.3.
version 1.4.0beta94 [November 8, 2009] version 1.4.0beta94 [November 9, 2009]
Removed the obsolete, unused pnggccrd.c and pngvcrd.c files. Removed the obsolete, unused pnggccrd.c and pngvcrd.c files.
Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions. Updated CMakeLists.txt to add "-DPNG_CONFIGURE_LIBPNG" to the definitions.
Removed dependency of pngtest.o on pngpriv.h in the makefiles. Removed dependency of pngtest.o on pngpriv.h in the makefiles.
Only #define PNG_DEPSTRUCT, etc. in pngconf.h if not already defined.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

12
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng /* pngconf.h - machine configurable file for libpng
* *
* libpng version 1.4.0beta94 - November 7, 2009 * libpng version 1.4.0beta94 - November 9, 2009
* For conditions of distribution and use, see copyright notice in png.h * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 Glenn Randers-Pehrson * Copyright (c) 1998-2009 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -1291,19 +1291,29 @@ typedef char FAR * FAR * FAR * png_charppp;
* functions in png.h will generate compiler warnings. * functions in png.h will generate compiler warnings.
*/ */
#ifdef __GNUC__ #ifdef __GNUC__
# ifndef PNG_DEPRECATED
# define PNG_DEPRECATED __attribute__((__deprecated__)) # define PNG_DEPRECATED __attribute__((__deprecated__))
# endif
# ifndef PNG_USE_RESULT
# define PNG_USE_RESULT __attribute__((__warn_unused_result__)) # define PNG_USE_RESULT __attribute__((__warn_unused_result__))
# endif
# ifndef PNG_NORETURN
# define PNG_NORETURN __attribute__((__noreturn__)) # define PNG_NORETURN __attribute__((__noreturn__))
# endif
# ifndef PNG_ALLOCATED
# define PNG_ALLOCATED __attribute__((__malloc__)) # define PNG_ALLOCATED __attribute__((__malloc__))
# endif
# ifndef PNG_CONFIGURE_LIBPNG # ifndef PNG_CONFIGURE_LIBPNG
/* This specifically protects structure members that should only be /* This specifically protects structure members that should only be
* accessed from within the library, therefore should be empty during * accessed from within the library, therefore should be empty during
* a library build. * a library build.
*/ */
# ifndef PNG_DEPSTRUCT
# define PNG_DEPSTRUCT __attribute__((__deprecated__)) # define PNG_DEPSTRUCT __attribute__((__deprecated__))
# endif # endif
# endif # endif
#endif
#ifndef PNG_DEPRECATED #ifndef PNG_DEPRECATED
# define PNG_DEPRECATED /* use of this function is deprecated */ # define PNG_DEPRECATED /* use of this function is deprecated */