Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
967b29d3
Commit
967b29d3
authored
Dec 06, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
png: Import upstream release 1.6.39.
parent
80e57245
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
24 deletions
+25
-24
AUTHORS
libs/png/AUTHORS
+2
-1
png.c
libs/png/png.c
+3
-3
png.h
libs/png/png.h
+8
-8
pngconf.h
libs/png/pngconf.h
+1
-1
pngpriv.h
libs/png/pngpriv.h
+1
-1
pngread.c
libs/png/pngread.c
+2
-2
pngrutil.c
libs/png/pngrutil.c
+1
-1
pngwrite.c
libs/png/pngwrite.c
+4
-4
pngwutil.c
libs/png/pngwutil.c
+3
-3
No files found.
libs/png/AUTHORS
View file @
967b29d3
...
@@ -35,9 +35,10 @@ Authors, for copyright and licensing purposes.
...
@@ -35,9 +35,10 @@ Authors, for copyright and licensing purposes.
* Arm Holdings
* Arm Holdings
- Richard Townsend
- Richard Townsend
* Google Inc.
* Google Inc.
- Dan Field
- Leon Scroggins III
- Matt Sarett
- Matt Sarett
- Mike Klein
- Mike Klein
- Dan Field
- Sami Boukortt
- Sami Boukortt
The build projects, the build scripts, the test scripts, and other
The build projects, the build scripts, the test scripts, and other
...
...
libs/png/png.c
View file @
967b29d3
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
#include "pngpriv.h"
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
/* Generate a compiler error if there is an old png.h in the search path. */
typedef
png_libpng_version_1_6_3
8
Your_png_h_is_not_version_1_6_38
;
typedef
png_libpng_version_1_6_3
9
Your_png_h_is_not_version_1_6_39
;
#ifdef __GNUC__
#ifdef __GNUC__
/* The version tests may need to be added to, but the problem warning has
/* The version tests may need to be added to, but the problem warning has
...
@@ -815,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr)
...
@@ -815,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr)
return
PNG_STRING_COPYRIGHT
return
PNG_STRING_COPYRIGHT
#else
#else
return
PNG_STRING_NEWLINE
\
return
PNG_STRING_NEWLINE
\
"libpng version 1.6.3
8
"
PNG_STRING_NEWLINE
\
"libpng version 1.6.3
9
"
PNG_STRING_NEWLINE
\
"Copyright (c) 2018-2022 Cosmin Truta"
PNG_STRING_NEWLINE
\
"Copyright (c) 2018-2022 Cosmin Truta"
PNG_STRING_NEWLINE
\
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson"
\
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson"
\
PNG_STRING_NEWLINE
\
PNG_STRING_NEWLINE
\
...
@@ -2710,7 +2710,7 @@ png_check_IHDR(png_const_structrp png_ptr,
...
@@ -2710,7 +2710,7 @@ png_check_IHDR(png_const_structrp png_ptr,
int
/* PRIVATE */
int
/* PRIVATE */
png_check_fp_number
(
png_const_charp
string
,
size_t
size
,
int
*
statep
,
png_check_fp_number
(
png_const_charp
string
,
size_t
size
,
int
*
statep
,
png_size_tp
whereami
)
size_t
*
whereami
)
{
{
int
state
=
*
statep
;
int
state
=
*
statep
;
size_t
i
=
*
whereami
;
size_t
i
=
*
whereami
;
...
...
libs/png/png.h
View file @
967b29d3
/* png.h - header file for PNG reference library
/* png.h - header file for PNG reference library
*
*
* libpng version 1.6.3
8 - September 14
, 2022
* libpng version 1.6.3
9 - November 20
, 2022
*
*
* Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
* 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:
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
* Glenn Randers-Pehrson
* Glenn Randers-Pehrson
* libpng versions 1.6.36, December 2018, through 1.6.3
8, Sept
ember 2022:
* libpng versions 1.6.36, December 2018, through 1.6.3
9, Nov
ember 2022:
* Cosmin Truta
* Cosmin Truta
* See also "Contributing Authors", below.
* See also "Contributing Authors", below.
*/
*/
...
@@ -239,7 +239,7 @@
...
@@ -239,7 +239,7 @@
* ...
* ...
* 1.5.30 15 10530 15.so.15.30[.0]
* 1.5.30 15 10530 15.so.15.30[.0]
* ...
* ...
* 1.6.3
8 16 10638 16.so.16.38
[.0]
* 1.6.3
9 16 10639 16.so.16.39
[.0]
*
*
* Henceforth the source version will match the shared-library major and
* Henceforth the source version will match the shared-library major and
* minor numbers; the shared-library major version number will be used for
* minor numbers; the shared-library major version number will be used for
...
@@ -278,8 +278,8 @@
...
@@ -278,8 +278,8 @@
*/
*/
/* Version information for png.h - this should match the version in png.c */
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.3
8
"
#define PNG_LIBPNG_VER_STRING "1.6.3
9
"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.3
8 - September 14
, 2022\n"
#define PNG_HEADER_VERSION_STRING " libpng version 1.6.3
9 - November 20
, 2022\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
...
@@ -287,7 +287,7 @@
...
@@ -287,7 +287,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
#define PNG_LIBPNG_VER_MINOR 6
#define PNG_LIBPNG_VER_RELEASE 3
8
#define PNG_LIBPNG_VER_RELEASE 3
9
/* This should be zero for a public release, or non-zero for a
/* This should be zero for a public release, or non-zero for a
* development version. [Deprecated]
* development version. [Deprecated]
...
@@ -318,7 +318,7 @@
...
@@ -318,7 +318,7 @@
* From version 1.0.1 it is:
* From version 1.0.1 it is:
* XXYYZZ, where XX=major, YY=minor, ZZ=release
* XXYYZZ, where XX=major, YY=minor, ZZ=release
*/
*/
#define PNG_LIBPNG_VER 1063
8
/* 1.6.38
*/
#define PNG_LIBPNG_VER 1063
9
/* 1.6.39
*/
/* Library configuration: these options cannot be changed after
/* Library configuration: these options cannot be changed after
* the library has been built.
* the library has been built.
...
@@ -428,7 +428,7 @@ extern "C" {
...
@@ -428,7 +428,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
* do not agree upon the version number.
*/
*/
typedef
char
*
png_libpng_version_1_6_3
8
;
typedef
char
*
png_libpng_version_1_6_3
9
;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
*
...
...
libs/png/pngconf.h
View file @
967b29d3
/* pngconf.h - machine-configurable file for libpng
/* pngconf.h - machine-configurable file for libpng
*
*
* libpng version 1.6.3
8
* libpng version 1.6.3
9
*
*
* Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 2018-2022 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
...
...
libs/png/pngpriv.h
View file @
967b29d3
...
@@ -1946,7 +1946,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
...
@@ -1946,7 +1946,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr,
* the problem character.) This has not been tested within libpng.
* the problem character.) This has not been tested within libpng.
*/
*/
PNG_INTERNAL_FUNCTION
(
int
,
png_check_fp_number
,(
png_const_charp
string
,
PNG_INTERNAL_FUNCTION
(
int
,
png_check_fp_number
,(
png_const_charp
string
,
size_t
size
,
int
*
statep
,
png_size_tp
whereami
),
PNG_EMPTY
);
size_t
size
,
int
*
statep
,
size_t
*
whereami
),
PNG_EMPTY
);
/* This is the same but it checks a complete string and returns true
/* This is the same but it checks a complete string and returns true
* only if it just contains a floating point number. As of 1.5.4 this
* only if it just contains a floating point number. As of 1.5.4 this
...
...
libs/png/pngread.c
View file @
967b29d3
...
@@ -3762,13 +3762,13 @@ png_image_read_direct(png_voidp argument)
...
@@ -3762,13 +3762,13 @@ png_image_read_direct(png_voidp argument)
mode
=
PNG_ALPHA_PNG
;
mode
=
PNG_ALPHA_PNG
;
output_gamma
=
PNG_DEFAULT_sRGB
;
output_gamma
=
PNG_DEFAULT_sRGB
;
}
}
if
((
change
&
PNG_FORMAT_FLAG_ASSOCIATED_ALPHA
)
!=
0
)
if
((
change
&
PNG_FORMAT_FLAG_ASSOCIATED_ALPHA
)
!=
0
)
{
{
mode
=
PNG_ALPHA_OPTIMIZED
;
mode
=
PNG_ALPHA_OPTIMIZED
;
change
&=
~
PNG_FORMAT_FLAG_ASSOCIATED_ALPHA
;
change
&=
~
PNG_FORMAT_FLAG_ASSOCIATED_ALPHA
;
}
}
/* If 'do_local_background' is set check for the presence of gamma
/* If 'do_local_background' is set check for the presence of gamma
* correction; this is part of the work-round for the libpng bug
* correction; this is part of the work-round for the libpng bug
* described above.
* described above.
...
...
libs/png/pngrutil.c
View file @
967b29d3
...
@@ -3186,7 +3186,7 @@ png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
...
@@ -3186,7 +3186,7 @@ png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length)
{
{
png_debug2
(
0
,
" length = %lu, limit = %lu"
,
png_debug2
(
0
,
" length = %lu, limit = %lu"
,
(
unsigned
long
)
length
,(
unsigned
long
)
limit
);
(
unsigned
long
)
length
,(
unsigned
long
)
limit
);
png_
chunk
_error
(
png_ptr
,
"chunk data is too large"
);
png_
benign
_error
(
png_ptr
,
"chunk data is too large"
);
}
}
}
}
...
...
libs/png/pngwrite.c
View file @
967b29d3
...
@@ -75,10 +75,10 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
...
@@ -75,10 +75,10 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
* library. If you have a new chunk to add, make a function to write it,
* library. If you have a new chunk to add, make a function to write it,
* and put it in the correct location here. If you want the chunk written
* and put it in the correct location here. If you want the chunk written
* after the image data, put it in png_write_end(). I strongly encourage
* after the image data, put it in png_write_end(). I strongly encourage
* you to supply a PNG_INFO_
flag, and check info_ptr->valid before writing
* you to supply a PNG_INFO_
<chunk> flag, and check info_ptr->valid before
*
the chunk, as that will keep the code from breaking if you want to jus
t
*
writing the chunk, as that will keep the code from breaking if you wan
t
*
write a plain PNG file. If you have long comments, I suggest writing
*
to just write a plain PNG file. If you have long comments, I suggest
* them in png_write_end(), and compressing them.
*
writing
them in png_write_end(), and compressing them.
*/
*/
void
PNGAPI
void
PNGAPI
png_write_info_before_PLTE
(
png_structrp
png_ptr
,
png_const_inforp
info_ptr
)
png_write_info_before_PLTE
(
png_structrp
png_ptr
,
png_const_inforp
info_ptr
)
...
...
libs/png/pngwutil.c
View file @
967b29d3
/* pngwutil.c - utilities to write a PNG file
/* pngwutil.c - utilities to write a PNG file
*
*
* Copyright (c) 2018 Cosmin Truta
* Copyright (c) 2018
-2022
Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
...
@@ -1747,7 +1747,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
...
@@ -1747,7 +1747,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
{
{
png_uint_32
purpose_len
;
png_uint_32
purpose_len
;
size_t
units_len
,
total_len
;
size_t
units_len
,
total_len
;
png_size_tp
params_len
;
size_t
*
params_len
;
png_byte
buf
[
10
];
png_byte
buf
[
10
];
png_byte
new_purpose
[
80
];
png_byte
new_purpose
[
80
];
int
i
;
int
i
;
...
@@ -1769,7 +1769,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
...
@@ -1769,7 +1769,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0,
png_debug1
(
3
,
"pCAL units length = %d"
,
(
int
)
units_len
);
png_debug1
(
3
,
"pCAL units length = %d"
,
(
int
)
units_len
);
total_len
=
purpose_len
+
units_len
+
10
;
total_len
=
purpose_len
+
units_len
+
10
;
params_len
=
(
png_size_tp
)
png_malloc
(
png_ptr
,
params_len
=
(
size_t
*
)
png_malloc
(
png_ptr
,
(
png_alloc_size_t
)((
png_alloc_size_t
)
nparams
*
(
sizeof
(
size_t
))));
(
png_alloc_size_t
)((
png_alloc_size_t
)
nparams
*
(
sizeof
(
size_t
))));
/* Find the length of each parameter, making sure we don't count the
/* Find the length of each parameter, making sure we don't count the
...
...
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