mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX

Browse Source 
in pngpriv.h in case the user forgot to define them in their pngusr.h.  This
means it is safe for people not building a DLL to omit these defines from pngusr.h.
This commit is contained in:
Glenn Randers-Pehrson 2010-08-24 21:05:43 -05:00
parent f45a345adb
commit 4f108d8af6
11 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.0beta45 - August 24, 2010
Libpng 1.5.0beta45 - August 25, 2010
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.
@ -226,7 +226,7 @@ version 1.5.0beta24 [May 7, 2010]
offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
Added more blank lines for readability.
version 1.5.0beta25 [August 24, 2010]
version 1.5.0beta25 [August 25, 2010]
In pngpread.c: png_push_have_row() add check for new_row > height
Removed the now-redundant check for out-of-bounds new_row from example.c
@ -377,7 +377,7 @@ Version 1.5.0beta44 [August 24, 2010]
Implemented progressive read in pngvalid.c gamma tests
Turn on progressive reader in pngvalid.c by default and tidy code.
Version 1.5.0beta45 [August 24, 2010]
Version 1.5.0beta45 [August 25, 2010]
Added an explicit make step to projects/vstudio for pnglibconf.h
Also corrected zlib.vcxproj into which Visual Studio had introduced
what it calls an "authoring error". The change to make pnglibconf.h
@ -385,6 +385,8 @@ Version 1.5.0beta45 [August 24, 2010]
file from scripts/pnglibconf.dfa as the other build systems do.
Changed pngvalid to work when floating point APIs are disabled
Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt
Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX
in pngpriv.h in case the user forgot to define them in their pngusr.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit

4
CHANGES
View File

@ -3014,7 +3014,7 @@ Version 1.5.0beta44 [August 24, 2010]
Implemented progressive read in pngvalid.c gamma tests
Turn on progressive reader in pngvalid.c by default and tidy code.
Version 1.5.0beta45 [August 24, 2010]
Version 1.5.0beta45 [August 25, 2010]
Added an explicit make step to projects/vstudio for pnglibconf.h
Also corrected zlib.vcxproj into which Visual Studio had introduced
what it calls an "authoring error". The change to make pnglibconf.h
@ -3022,6 +3022,8 @@ Version 1.5.0beta45 [August 24, 2010]
file from scripts/pnglibconf.dfa as the other build systems do.
Changed pngvalid to work when floating point APIs are disabled
Renamed the prebuilt scripts/pnglibconf.h to scripts/pnglibconf.h.prebuilt
Supply default values for PNG_USER_PRIVATEBUILD and PNG_USER_DLLFNAME_POSTFIX
in pngpriv.h in case the user forgot to define them in their pngusr.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

9
pngpriv.h
View File

@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.5.0beta45 - August 24, 2010
* libpng version 1.5.0beta45 - August 25, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -32,6 +32,13 @@
#define PNGLIB_BUILD
#ifdef PNG_USER_CONFIG
# include "pngusr.h"
/* These should have been defined in pngusr.h */
# ifndef PNG_USER_PRIVATEBUILD
# define PNG_USER_PRIVATEBUILD "Custom libpng build"
# endif
# ifndef PNG_USER_DLLFNAME_POSTFIX
# define PNG_USER_DLLFNAME_POSTFIX "Cb"
# endif
#endif
#include "png.h"
#include "pnginfo.h"

2
scripts/README.txt
View File

@ -1,5 +1,5 @@
Makefiles for libpng version 1.5.0beta45 - August 24, 2010
Makefiles for libpng version 1.5.0beta45 - August 25, 2010
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile

2
scripts/options.awk
View File

@ -1,7 +1,7 @@
#!/bin/awk -f
# scripts/options.awk - library build configuration control
#
# last changed in libpng version 1.5.0 - August 24, 2010
# last changed in libpng version 1.5.0 - August 25, 2010
#
# Copyright (c) 1998-2010 Glenn Randers-Pehrson
#

14
scripts/pnglibconf.dfa
View File

@ -6,7 +6,7 @@
#
com pnglibconf.h - library build configuration
com
com libpng version PNGLIB_VERSION - last changed on August 24, 2010
com libpng version PNGLIB_VERSION - last changed on August 25, 2010
com
com Copyright (c) 1998-2010 Glenn Randers-Pehrson
com
@ -14,6 +14,7 @@ com This code is released under the libpng license.
com For conditions of distribution and use, see the disclaimer
com and license in png.h
com
file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# This file is preprocessed by scripts/options.awk and the
@ -70,10 +71,6 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# is safer to ensure that -DPNG_USER_CONFIG is specified throughout
# the build by changing the CPPFLAGS passed to the initial ./configure
#
# This process will result in a very annoying build fail if you
# forget to define both 'PNG_USER_PRIVATEBUILD' and
# 'PNG_USER_DLLFNAME_POSTFIX' in pngusr.h - this is deliberate.
#
# 2) Add definitions of the settings you want to change to
# CPPFLAGS; for example:
#
@ -105,15 +102,12 @@ file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
# The following causes commented out #undef lines to be written to
# pnglibconf.h; this can be stopped by logunsupported=0 in a later
# file or on the command line (after pnglibconf.dfa)
logunsupported = 1
# PNG_USER_CONFIG has to be defined on the compiler command line
# to cause pngusr.h to be read while constructing pnglibconf.h
#
# If this is set during the build 'pnglibconf.h' will define
# PNG_USER_PRIVATEBUILD to the value that *must* be set by pngusr.h
# and contain other definitions as below.
#
# If you create a private DLL you need to define the following
# macros in the file 'pngusr.h' and set -DPNG_USER_CONFIG for
# compilation (i.e. in CFLAGS.)
@ -150,7 +144,7 @@ logunsupported = 1
# Note that PNG_USR_CONFIG only has an effect when building
# pnglibconf.h
setting USER_CONFIG requires USER_PRIVATEBUILD USER_DLLFNAME_POSTFIX
setting USER_CONFIG
setting USER_PRIVATEBUILD
setting USER_DLLFNAME_POSTFIX
setting USER_VERSIONINFO_COMMENTS

2
scripts/pnglibconf.h.prebuilt
View File

@ -1,7 +1,7 @@
/* libpng-1.5.0beta45 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* last changed in libpng version 1.5.0 - August 24, 2010 */
/* last changed in libpng version 1.5.0 - August 25, 2010 */
/* Copyright (c) 1998-2010 Glenn Randers-Pehrson */

2
scripts/pngwin.dfn
View File

@ -1,7 +1,7 @@
/* pngwin.dfn - define format of pngwin.def
*
* Last changed in libpng version 1.5.0 [August 24, 2010]
* Last changed in libpng version 1.5.0 [August 25, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.

2
scripts/sym.dfn
View File

@ -1,7 +1,7 @@
/* sym.dfn - define format of libpng.sym
*
* Last changed in libpng version 1.5.0 [August 24, 2010]
* Last changed in libpng version 1.5.0 [August 25, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.

2
scripts/symbols.dfn
View File

@ -1,7 +1,7 @@
/* symbols.dfn - find all exported symbols
*
* Last changed in libpng version 1.5.0 [August 24, 2010]
* Last changed in libpng version 1.5.0 [August 25, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.

2
scripts/vers.dfn
View File

@ -1,7 +1,7 @@
/* vers.dfn - define format of libpng.vers
*
* Last changed in libpng version 1.5.0 [August 24, 2010]
* Last changed in libpng version 1.5.0 [August 25, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.