Skip to content

Commit

Permalink
Bump version to 1.6.47.git
Browse files Browse the repository at this point in the history
  • Loading branch information
ctruta committed Jan 27, 2025
1 parent 0024abd commit 171bdd3
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 34 deletions.
8 changes: 8 additions & 0 deletions ANNOUNCE
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
libpng 1.6.47.git
=================

This is a development version, not intended to be a public release.
It will be replaced by a public release, or by another development
version, at a later time.


libpng 1.6.46 - January 23, 2025
================================

Expand Down
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -6239,6 +6239,8 @@ Version 1.6.46 [January 23, 2025]
Cleaned up contrib/pngminus: corrected an old typo, removed an old
workaround, and updated the CMake file.

Version 1.6.47 [TODO]

Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Subscription is required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ cmake_minimum_required(VERSION 3.14)

set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
set(PNGLIB_REVISION 46)
set(PNGLIB_SUBREVISION 0)
#set(PNGLIB_SUBREVISION "git")
set(PNGLIB_REVISION 47)
#set(PNGLIB_SUBREVISION 0)
set(PNGLIB_SUBREVISION "git")
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_REVISION})
set(PNGLIB_ABI_VERSION ${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_SHARED_VERSION ${PNGLIB_ABI_VERSION}.${PNGLIB_REVISION}.${PNGLIB_SUBREVISION})
Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
README for libpng version 1.6.46
================================
README for libpng version 1.6.47.git
====================================

See the note about version numbers near the top of `png.h`.
See `INSTALL` for instructions on how to install libpng.
Expand Down
24 changes: 12 additions & 12 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for libpng 1.6.46.
# Generated by GNU Autoconf 2.72 for libpng 1.6.47.git.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
Expand Down Expand Up @@ -614,8 +614,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.6.46'
PACKAGE_STRING='libpng 1.6.46'
PACKAGE_VERSION='1.6.47.git'
PACKAGE_STRING='libpng 1.6.47.git'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''

Expand Down Expand Up @@ -1421,7 +1421,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
'configure' configures libpng 1.6.46 to adapt to many kinds of systems.
'configure' configures libpng 1.6.47.git to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1492,7 +1492,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.6.46:";;
short | recursive ) echo "Configuration of libpng 1.6.47.git:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1689,7 +1689,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.6.46
libpng configure 1.6.47.git
generated by GNU Autoconf 2.72

Copyright (C) 2023 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by libpng $as_me 1.6.46, which was
It was created by libpng $as_me 1.6.47.git, which was
generated by GNU Autoconf 2.72. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -3433,7 +3433,7 @@ fi

# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.6.46'
VERSION='1.6.47.git'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -3528,10 +3528,10 @@ fi



PNGLIB_VERSION=1.6.46
PNGLIB_VERSION=1.6.47.git
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=46
PNGLIB_RELEASE=47



Expand Down Expand Up @@ -16165,7 +16165,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libpng $as_me 1.6.46, which was
This file was extended by libpng $as_me 1.6.47.git, which was
generated by GNU Autoconf 2.72. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -16233,7 +16233,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
libpng config.status 1.6.46
libpng config.status 1.6.47.git
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"

Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ AC_PREREQ([2.68])

dnl Version number stuff here:

AC_INIT([libpng],[1.6.46],[png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng],[1.6.47.git],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts/autoconf])

# libpng does not follow GNU file name conventions (hence 'foreign')
Expand All @@ -46,10 +46,10 @@ dnl automake, so the following is not necessary (and is not defined anyway):
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake

PNGLIB_VERSION=1.6.46
PNGLIB_VERSION=1.6.47.git
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=46
PNGLIB_RELEASE=47

dnl End of version number stuff

Expand Down
4 changes: 2 additions & 2 deletions png.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "pngpriv.h"

/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_46 Your_png_h_is_not_version_1_6_46;
typedef png_libpng_version_1_6_47_git Your_png_h_is_not_version_1_6_47_git;

/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
Expand Down Expand Up @@ -793,7 +793,7 @@ png_get_copyright(png_const_structrp png_ptr)
return PNG_STRING_COPYRIGHT
#else
return PNG_STRING_NEWLINE \
"libpng version 1.6.46" PNG_STRING_NEWLINE \
"libpng version 1.6.47.git" PNG_STRING_NEWLINE \
"Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \
Expand Down
14 changes: 7 additions & 7 deletions png.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.6.46
* libpng version 1.6.47.git
*
* Copyright (c) 2018-2025 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
Expand Down Expand Up @@ -274,7 +274,7 @@
*/

/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.46"
#define PNG_LIBPNG_VER_STRING "1.6.47.git"
#define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"

/* The versions of shared library builds should stay in sync, going forward */
Expand All @@ -285,12 +285,12 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
#define PNG_LIBPNG_VER_RELEASE 46
#define PNG_LIBPNG_VER_RELEASE 47

/* This should be zero for a public release, or non-zero for a
* development version.
*/
#define PNG_LIBPNG_VER_BUILD 0
#define PNG_LIBPNG_VER_BUILD 1

/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
Expand All @@ -307,7 +307,7 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */

#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA

/* Careful here. At one time, Guy wanted to use 082, but that
* would be octal. We must not include leading zeros.
Expand All @@ -316,7 +316,7 @@
* From version 1.0.1 it is:
* XXYYZZ, where XX=major, YY=minor, ZZ=release
*/
#define PNG_LIBPNG_VER 10646 /* 1.6.46 */
#define PNG_LIBPNG_VER 10647 /* 1.6.47.git */

/* Library configuration: these options cannot be changed after
* the library has been built.
Expand Down Expand Up @@ -426,7 +426,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
typedef char* png_libpng_version_1_6_46;
typedef char* png_libpng_version_1_6_47_git;

/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
Expand Down
2 changes: 1 addition & 1 deletion pngconf.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* pngconf.h - machine-configurable file for libpng
*
* libpng version 1.6.46
* libpng version 1.6.47.git
*
* Copyright (c) 2018-2025 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
Expand Down
2 changes: 1 addition & 1 deletion pngtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#define STDERR stdout

/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_46 Your_png_h_is_not_version_1_6_46;
typedef png_libpng_version_1_6_47_git Your_png_h_is_not_version_1_6_47_git;

/* Ensure that all version numbers in png.h are consistent with one another. */
#if (PNG_LIBPNG_VER != PNG_LIBPNG_VER_MAJOR * 10000 + \
Expand Down
2 changes: 1 addition & 1 deletion scripts/libpng-config-head.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# Modeled after libxml-config.

version=1.6.46
version=1.6.47.git
prefix=""
libdir=""
libs=""
Expand Down
2 changes: 1 addition & 1 deletion scripts/libpng.pc.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ includedir=@includedir@/libpng16

Name: libpng
Description: Loads and saves PNG files
Version: 1.6.46
Version: 1.6.47.git
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
2 changes: 1 addition & 1 deletion scripts/pnglibconf.h.prebuilt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* pnglibconf.h - library build configuration */

/* libpng version 1.6.46 */
/* libpng version 1.6.47.git */

/* Copyright (c) 2018-2025 Cosmin Truta */
/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
Expand Down

0 comments on commit 171bdd3

Please sign in to comment.