diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-08 14:12:14 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-12 08:14:03 +0000 |
| commit | 0d7c049e4407bf0db8d1eca1ea248c6d6b739c8c (patch) | |
| tree | 2f7c28cb414a549278d22c0f304a8f7c2fc30f64 /src/3rdparty/libpng/qtpatches.diff | |
| parent | dc5f9d0c3101f95185d3c562d001e0af18f46a0b (diff) | |
Update bundled libpng to version 1.6.35
The remaining diff to clean 1.6.35 is archived in the qtpatches.diff file.
[ChangeLog][Third-Party Code] libpng was updated to version 1.6.35
Change-Id: I925b3d95f6da20e12fc3274b4713e3fea05094f7
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libpng/qtpatches.diff')
| -rw-r--r-- | src/3rdparty/libpng/qtpatches.diff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/libpng/qtpatches.diff b/src/3rdparty/libpng/qtpatches.diff index 82ee104545..508d5874e4 100644 --- a/src/3rdparty/libpng/qtpatches.diff +++ b/src/3rdparty/libpng/qtpatches.diff @@ -1,5 +1,5 @@ diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h -index c466d4b..f7a4547 100644 +index 3581f67919..e43862a886 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -23,6 +23,12 @@ @@ -15,7 +15,7 @@ index c466d4b..f7a4547 100644 /* Feature Test Macros. The following are defined here to ensure that correctly * implemented libraries reveal the APIs libpng needs to build and hide those * that are not needed and potentially damaging to the compilation. -@@ -219,6 +225,11 @@ +@@ -305,6 +311,11 @@ # endif #endif /* Setting PNG_BUILD_DLL if required */ @@ -27,7 +27,7 @@ index c466d4b..f7a4547 100644 /* See pngconf.h for more details: the builder of the library may set this on * the command line to the right thing for the specific compilation system or it * may be automagically set above (at present we know of no system where it does -@@ -447,6 +458,9 @@ +@@ -543,6 +554,9 @@ #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ defined(_WIN32) || defined(__WIN32__) # include <windows.h> /* defines _WINDOWS_ macro */ @@ -37,7 +37,7 @@ index c466d4b..f7a4547 100644 #endif #endif /* PNG_VERSION_INFO_ONLY */ -@@ -457,7 +471,7 @@ +@@ -553,7 +567,7 @@ /* Memory model/platform independent fns */ #ifndef PNG_ABORT |