Skip to content

Commit

Permalink
Merge tag 'v1.6.45' into libpng18
Browse files Browse the repository at this point in the history
Sync with libpng version 1.6.45
  • Loading branch information
ctruta committed Jan 7, 2025
2 parents f6c6bdf + 51f5bd6 commit 98c7e8f
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 12 deletions.
11 changes: 11 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -6218,6 +6218,17 @@ Version 1.6.44 [September 12, 2024]
(Contributed by Ben Wagner)
Fixed and improved the config files for AppVeyor CI and Travis CI.

Version 1.6.45 [January 7, 2025]
Added support for the cICP chunk.
(Contributed by Lucas Chollet and John Bowler)
Adjusted and improved various checks in colorspace calculations.
(Contributed by John Bowler)
Rearranged the write order of colorspace chunks for better conformance
with the PNG v3 draft specification.
(Contributed by John Bowler)
Raised the minimum required CMake version from 3.6 to 3.14.
Forked off a development branch for libpng version 1.8.

Version 1.8.0 [TODO]

Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
Expand Down
6 changes: 3 additions & 3 deletions manuals/libpng-manual.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng

Copyright (c) 2018-2024 Cosmin Truta
Copyright (c) 2018-2025 Cosmin Truta
Copyright (c) 1998-2018 Glenn Randers-Pehrson

This document is released under the libpng license.
Expand All @@ -9,9 +9,9 @@ libpng-manual.txt - A description on how to use and modify libpng

Based on:

libpng version 1.6.36, December 2018, through 1.6.44 - September 2024
libpng version 1.6.36, December 2018, through 1.6.45 - January 2025
Updated and distributed by Cosmin Truta
Copyright (c) 2018-2024 Cosmin Truta
Copyright (c) 2018-2025 Cosmin Truta

libpng versions 0.97, January 1998, through 1.6.35 - July 2018
Updated and distributed by Glenn Randers-Pehrson
Expand Down
10 changes: 5 additions & 5 deletions manuals/libpng.3
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "September 12, 2024"
.TH LIBPNG 3 "January 7, 2025"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.44
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.45

.SH SYNOPSIS
\fB#include <png.h>\fP
Expand Down Expand Up @@ -509,7 +509,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng

Copyright (c) 2018-2024 Cosmin Truta
Copyright (c) 2018-2025 Cosmin Truta
Copyright (c) 1998-2018 Glenn Randers-Pehrson

This document is released under the libpng license.
Expand All @@ -518,9 +518,9 @@ libpng-manual.txt - A description on how to use and modify libpng

Based on:

libpng version 1.6.36, December 2018, through 1.6.44 - September 2024
libpng version 1.6.36, December 2018, through 1.6.45 - January 2025
Updated and distributed by Cosmin Truta
Copyright (c) 2018-2024 Cosmin Truta
Copyright (c) 2018-2025 Cosmin Truta

libpng versions 0.97, January 1998, through 1.6.35 - July 2018
Updated and distributed by Glenn Randers-Pehrson
Expand Down
7 changes: 6 additions & 1 deletion manuals/png.5
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH PNG 5 "September 12, 2024"
.TH PNG 5 "January 7, 2025"
.SH NAME
png \- Portable Network Graphics (PNG) format

Expand All @@ -20,6 +20,11 @@ matching on heterogeneous platforms.
.SH "SEE ALSO"
.BR "libpng"(3), " zlib"(3), " deflate"(5), " " and " zlib"(5)
.LP
PNG Specification (Third Edition) Candidate Recommendation Draft, July 2024:
.IP
.br
https://www.w3.org/TR/2024/CRD-png-3-20240718/
.LP
PNG Specification (Second Edition), November 2003:
.IP
.br
Expand Down
4 changes: 2 additions & 2 deletions png.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
* Glenn Randers-Pehrson
* libpng versions 1.6.36, December 2018, through 1.6.44, September 2024:
* libpng versions 1.6.36, December 2018, through 1.6.45, January 2025:
* Cosmin Truta
* See also "Contributing Authors", below.
*/
Expand Down Expand Up @@ -238,7 +238,7 @@
* ...
* 1.5.30 15 10530 15.so.15.30[.0]
* ...
* 1.6.44 16 10644 16.so.16.44[.0]
* 1.6.45 16 10645 16.so.16.45[.0]
*
* Henceforth the source version will match the shared-library major and
* minor numbers; the shared-library major version number will be used for
Expand Down
2 changes: 1 addition & 1 deletion pngconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* libpng version 1.8.0.git
*
* Copyright (c) 2018-2024 Cosmin Truta
* Copyright (c) 2018-2025 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
Expand Down

0 comments on commit 98c7e8f

Please sign in to comment.