From f4e07ba408251bfdaaf022e836526594ab9cb9df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 22 Oct 2017 11:28:08 +0200 Subject: [PATCH] - up to 1.6.32 --- libpng-pngminus.patch | 32 ++++++++++++++++++++++++++++++++ libpng.spec | 6 +++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/libpng-pngminus.patch b/libpng-pngminus.patch index d929f9f..d8be596 100644 --- a/libpng-pngminus.patch +++ b/libpng-pngminus.patch @@ -38,3 +38,35 @@ png2pnm$(O): png2pnm$(C) $(CC) -c $(CFLAGS) png2pnm$(C) +--- libpng-1.6.32/contrib/pngminus/pnm2png.c~ 2017-08-24 21:44:51.000000000 +0200 ++++ libpng-1.6.32/contrib/pngminus/pnm2png.c 2017-10-22 11:21:14.284686698 +0200 +@@ -376,7 +376,7 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_ + /* row_bytes is the width x number of channels x (bit-depth / 8) */ + row_bytes = width * channels * ((bit_depth <= 8) ? 1 : 2); + +- if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes) ++ if ((row_bytes == 0 || (size_t)height > ((size_t)(-1))/(size_t)row_bytes)) + { + /* too big */ + return FALSE; +--- libpng-1.6.32/contrib/pngminus/png2pnm.c~ 2017-08-24 21:44:51.000000000 +0200 ++++ libpng-1.6.32/contrib/pngminus/png2pnm.c 2017-10-22 11:25:16.018590786 +0200 +@@ -443,7 +443,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_ + if (png_pixels != (unsigned char*) NULL) + free (png_pixels); + +- PNG_UNUSED(raw) /* to quiet a Coverity defect */ ++ + return TRUE; + + } /* end of source */ +--- libpng-1.6.32/contrib/pngminus/pnm2png.c~ 2017-10-22 11:26:20.000000000 +0200 ++++ libpng-1.6.32/contrib/pngminus/pnm2png.c 2017-10-22 11:26:43.537683599 +0200 +@@ -513,7 +513,6 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_ + if (png_pixels != (unsigned char*) NULL) + free (png_pixels); + +- PNG_UNUSED(raw) /* Quiet a Coverity defect */ + + return TRUE; + } /* end of pnm2png */ diff --git a/libpng.spec b/libpng.spec index a0843de..3d6e414 100644 --- a/libpng.spec +++ b/libpng.spec @@ -13,16 +13,16 @@ Summary(pl.UTF-8): Biblioteka PNG Summary(pt_BR.UTF-8): Biblioteca PNG Summary(tr.UTF-8): PNG kitaplığı Name: libpng -Version: 1.6.31 +Version: 1.6.32 Release: 1 Epoch: 2 License: distributable Group: Libraries Source0: http://downloads.sourceforge.net/libpng/%{name}-%{version}.tar.xz -# Source0-md5: 1b34eab440263e32cfa39d19413fad54 +# Source0-md5: e01be057a9369183c959b793a685ad15 Patch0: %{name}-pngminus.patch Patch1: http://downloads.sourceforge.net/libpng-apng/%{name}-%{version}-apng.patch.gz -# Patch1-md5: c13dbdd84b768d450b2c4f035a8d911a +# Patch1-md5: 1760dbaa13c2569fdda6d83f6483701e URL: http://www.libpng.org/pub/png/libpng.html BuildRequires: rpmbuild(macros) >= 1.213 BuildRequires: tar >= 1:1.22 -- 2.44.0