Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
e9d1d648
Commit
e9d1d648
authored
Oct 29, 2017
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libpng: Cosmetic update to upstream 1.6.34
No code change in the part we are using, it only affected contrib code. [ci skip]
parent
87694d18
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
22 deletions
+22
-22
README.md
thirdparty/README.md
+1
-1
LICENSE
thirdparty/libpng/LICENSE
+2
-2
png.c
thirdparty/libpng/png.c
+3
-3
png.h
thirdparty/libpng/png.h
+13
-13
pngconf.h
thirdparty/libpng/pngconf.h
+1
-1
pnglibconf.h
thirdparty/libpng/pnglibconf.h
+2
-2
No files found.
thirdparty/README.md
View file @
e9d1d648
...
...
@@ -121,7 +121,7 @@ Files extracted from upstream source:
## libpng
-
Upstream: http://libpng.org/pub/png/libpng.html
-
Version: 1.6.3
3
-
Version: 1.6.3
4
-
License: libpng/zlib
Files extracted from upstream source:
...
...
thirdparty/libpng/LICENSE
View file @
e9d1d648
...
...
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.0.7, July 1, 2000 through 1.6.3
3, September 28
, 2017 are
libpng versions 1.0.7, July 1, 2000 through 1.6.3
4, September 29
, 2017 are
Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
...
...
@@ -130,4 +130,4 @@ any encryption software. See the EAR, paragraphs 734.3(b)(3) and
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
September 2
8
, 2017
September 2
9
, 2017
thirdparty/libpng/png.c
View file @
e9d1d648
...
...
@@ -14,7 +14,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_3
3
Your_png_h_is_not_version_1_6_33
;
typedef
png_libpng_version_1_6_3
4
Your_png_h_is_not_version_1_6_34
;
#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
...
...
@@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.3
3 - September 28
, 2017"
PNG_STRING_NEWLINE
\
"libpng version 1.6.3
4 - September 29
, 2017"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson"
\
PNG_STRING_NEWLINE
\
"Copyright (c) 1996-1997 Andreas Dilger"
PNG_STRING_NEWLINE
\
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
\
PNG_STRING_NEWLINE
;
# else
return
"libpng version 1.6.3
3 - September 28
, 2017\
return
"libpng version 1.6.3
4 - September 29
, 2017\
Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."
;
...
...
thirdparty/libpng/png.h
View file @
e9d1d648
/* png.h - header file for PNG reference library
*
* libpng version 1.6.3
3, September 28
, 2017
* libpng version 1.6.3
4, September 29
, 2017
*
* Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
@@ -12,7 +12,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.6.3
3, September 28
, 2017:
* libpng versions 0.97, January 1998, through 1.6.3
4, September 29
, 2017:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
...
...
@@ -25,7 +25,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.0.7, July 1, 2000 through 1.6.3
3, September 28
, 2017 are
* libpng versions 1.0.7, July 1, 2000 through 1.6.3
4, September 29
, 2017 are
* Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are
* derived from libpng-1.0.6, and are distributed according to the same
* disclaimer and license as libpng-1.0.6 with the following individuals
...
...
@@ -209,11 +209,11 @@
* ...
* 1.0.19 10 10019 10.so.0.19[.0]
* ...
* 1.2.5
7 13 10257 12.so.0.57
[.0]
* 1.2.5
9 13 10257 12.so.0.59
[.0]
* ...
* 1.5.
28 15 10527 15.so.15.28
[.0]
* 1.5.
30 15 10527 15.so.15.30
[.0]
* ...
* 1.6.3
3 16 10633 16.so.16.33
[.0]
* 1.6.3
4 16 10633 16.so.16.34
[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
...
...
@@ -241,13 +241,13 @@
* Y2K compliance in libpng:
* =========================
*
* September 2
8
, 2017
* September 2
9
, 2017
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
* upward through 1.6.3
3
are Y2K compliant. It is my belief that
* upward through 1.6.3
4
are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant.
*
* Libpng only has two year fields. One is a 2-byte unsigned integer
...
...
@@ -309,8 +309,8 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.3
3
"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.3
3 - September 28
, 2017\n"
#define PNG_LIBPNG_VER_STRING "1.6.3
4
"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.3
4 - September 29
, 2017\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
...
...
@@ -318,7 +318,7 @@
/* 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 3
3
#define PNG_LIBPNG_VER_RELEASE 3
4
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
...
...
@@ -349,7 +349,7 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
#define PNG_LIBPNG_VER 1063
3
/* 1.6.33
*/
#define PNG_LIBPNG_VER 1063
4
/* 1.6.34
*/
/* Library configuration: these options cannot be changed after
* the library has been built.
...
...
@@ -459,7 +459,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_3
3
;
typedef
char
*
png_libpng_version_1_6_3
4
;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
...
...
thirdparty/libpng/pngconf.h
View file @
e9d1d648
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.6.3
3, September 28
, 2017
* libpng version 1.6.3
4, September 29
, 2017
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
...
...
thirdparty/libpng/pnglibconf.h
View file @
e9d1d648
/* libpng 1.6.3
3
STANDARD API DEFINITION */
/* libpng 1.6.3
4
STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* Libpng version 1.6.3
3 - September 28
, 2017 */
/* Libpng version 1.6.3
4 - September 29
, 2017 */
/* Copyright (c) 1998-2017 Glenn Randers-Pehrson */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment