diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2016-02-10 13:57:10 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2016-03-16 14:32:49 +0000 |
| commit | 714cb4020e12e078e8ba8c2c5493d138d515f46d (patch) | |
| tree | 3fc151b4662f4f4a9c5ea4bcf4444d87cd817444 /src/3rdparty/libpng/pngerror.c | |
| parent | 10a4151e83da4662eb51a8c67760f2e38d84759e (diff) | |
Update bundled libpng to version 1.6.20
Merged in the upstream version. The remaining diff to clean 1.6.20 is
archived in the qtpatches.diff file.
Change-Id: I56f557bfe04ac1aa0e2c090826bbb144ae93cbb7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libpng/pngerror.c')
| -rw-r--r-- | src/3rdparty/libpng/pngerror.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/pngerror.c b/src/3rdparty/libpng/pngerror.c index 0781866a89..bdb959ee51 100644 --- a/src/3rdparty/libpng/pngerror.c +++ b/src/3rdparty/libpng/pngerror.c @@ -768,7 +768,7 @@ png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN) /* If control reaches this point, png_longjmp() must not return. The only * choice is to terminate the whole process (or maybe the thread); to do - * this the ANSI-C abort() function is used unless a different method is + * this the ANSI-C abort() function is used unless a different method is * implemented by overriding the default configuration setting for * PNG_ABORT(). */ |