Accepting request 71159 from graphics
- updated to 10.35.80: * asciitopgm: fix bug: memory corruption on too-long lines. * asciitopgm: fix bug: improper handling of blank lines. * pngtopnm: fix bug: -verbose reports history chunk present when it's really a palette. * bmptopnm: Don't crash on invalid zero value of image height in the BMP header of a compressed file. * bmptopnm: don't crash on large invalid value of 'colorsused' in the BMP header. * ilbmtoppm: Don't crash on image that has a transparent color index, but no color map. OBS-URL: https://build.opensuse.org/request/show/71159 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netpbm?expand=0&rev=31
This commit is contained in:
commit
fc3324e184
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9287483d25620c565500140cc6af0210c7eb79ec19ba914dd57a697999458079
|
||||
size 582839
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02f7ee6c0a1c9c404b385e68599cb709f62e459b6c33a2f5a2e38e61fed268c4
|
||||
size 2110155
|
3
netpbm-10.35.80-documentation.tar.bz2
Normal file
3
netpbm-10.35.80-documentation.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f9a777c3eea1c9bac237b3420c247f49392761ded2187be95363140f01c12058
|
||||
size 566463
|
3
netpbm-10.35.80-nohpcdtoppm-nojbig.tar.bz2
Normal file
3
netpbm-10.35.80-nohpcdtoppm-nojbig.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:47cafd762170f588bedcdab3bee0743301ac873e62fa19d247e41e368d4334b9
|
||||
size 1637436
|
@ -1,57 +1,7 @@
|
||||
Index: netpbm-10.35.76/converter/other/pnmtopng.c
|
||||
Index: netpbm-10.35.80/converter/other/pngtopnm.c
|
||||
===================================================================
|
||||
--- netpbm-10.35.76.orig/converter/other/pnmtopng.c
|
||||
+++ netpbm-10.35.76/converter/other/pnmtopng.c
|
||||
@@ -69,12 +69,6 @@
|
||||
#include "nstring.h"
|
||||
#include "version.h"
|
||||
|
||||
-#if PNG_LIBPNG_VER >= 10400
|
||||
-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
|
||||
-#error You need either an older PNG library (older than 1.4)
|
||||
-#error newer Netpbm source code (at least 10.48)
|
||||
-#endif
|
||||
-
|
||||
|
||||
struct zlibCompression {
|
||||
/* These are parameters that describe a form of zlib compression.
|
||||
@@ -2612,7 +2606,7 @@ convertpnm(struct cmdlineInfo const cmdl
|
||||
info_ptr->num_palette = palette_size;
|
||||
if (trans_size > 0) {
|
||||
info_ptr->valid |= PNG_INFO_tRNS;
|
||||
- info_ptr->trans = trans;
|
||||
+ info_ptr->trans_alpha = trans;
|
||||
info_ptr->num_trans = trans_size; /* omit opaque values */
|
||||
}
|
||||
/* creating hIST chunk */
|
||||
@@ -2649,7 +2643,7 @@ convertpnm(struct cmdlineInfo const cmdl
|
||||
info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
|
||||
if (transparent > 0) {
|
||||
info_ptr->valid |= PNG_INFO_tRNS;
|
||||
- info_ptr->trans_values =
|
||||
+ info_ptr->trans_color =
|
||||
xelToPngColor_16(transcolor, maxval, png_maxval);
|
||||
}
|
||||
} else {
|
||||
@@ -2661,10 +2655,10 @@ convertpnm(struct cmdlineInfo const cmdl
|
||||
if (info_ptr->valid && PNG_INFO_tRNS)
|
||||
pm_message("Transparent color {gray, red, green, blue} = "
|
||||
"{%d, %d, %d, %d}",
|
||||
- info_ptr->trans_values.gray,
|
||||
- info_ptr->trans_values.red,
|
||||
- info_ptr->trans_values.green,
|
||||
- info_ptr->trans_values.blue);
|
||||
+ info_ptr->trans_color.gray,
|
||||
+ info_ptr->trans_color.red,
|
||||
+ info_ptr->trans_color.green,
|
||||
+ info_ptr->trans_color.blue);
|
||||
else
|
||||
pm_message("No transparent color");
|
||||
}
|
||||
Index: netpbm-10.35.76/converter/other/pngtopnm.c
|
||||
===================================================================
|
||||
--- netpbm-10.35.76.orig/converter/other/pngtopnm.c
|
||||
+++ netpbm-10.35.76/converter/other/pngtopnm.c
|
||||
--- netpbm-10.35.80.orig/converter/other/pngtopnm.c
|
||||
+++ netpbm-10.35.80/converter/other/pngtopnm.c
|
||||
@@ -44,12 +44,6 @@
|
||||
#include "nstring.h"
|
||||
#include "shhopt.h"
|
||||
@ -112,3 +62,54 @@ Index: netpbm-10.35.76/converter/other/pngtopnm.c
|
||||
}
|
||||
break;
|
||||
|
||||
Index: netpbm-10.35.80/converter/other/pnmtopng.c
|
||||
===================================================================
|
||||
--- netpbm-10.35.80.orig/converter/other/pnmtopng.c
|
||||
+++ netpbm-10.35.80/converter/other/pnmtopng.c
|
||||
@@ -69,13 +69,6 @@
|
||||
#include "nstring.h"
|
||||
#include "version.h"
|
||||
|
||||
-#if PNG_LIBPNG_VER >= 10400
|
||||
-#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
|
||||
-#error You need either an older PNG library (older than 1.4)
|
||||
-#error newer Netpbm source code (at least 10.47.04)
|
||||
-#endif
|
||||
-
|
||||
-
|
||||
struct zlibCompression {
|
||||
/* These are parameters that describe a form of zlib compression.
|
||||
Values have the same meaning as the similarly named arguments to
|
||||
@@ -2612,7 +2605,7 @@ convertpnm(struct cmdlineInfo const cmdl
|
||||
info_ptr->num_palette = palette_size;
|
||||
if (trans_size > 0) {
|
||||
info_ptr->valid |= PNG_INFO_tRNS;
|
||||
- info_ptr->trans = trans;
|
||||
+ info_ptr->trans_alpha = trans;
|
||||
info_ptr->num_trans = trans_size; /* omit opaque values */
|
||||
}
|
||||
/* creating hIST chunk */
|
||||
@@ -2649,7 +2642,7 @@ convertpnm(struct cmdlineInfo const cmdl
|
||||
info_ptr->color_type == PNG_COLOR_TYPE_RGB) {
|
||||
if (transparent > 0) {
|
||||
info_ptr->valid |= PNG_INFO_tRNS;
|
||||
- info_ptr->trans_values =
|
||||
+ info_ptr->trans_color =
|
||||
xelToPngColor_16(transcolor, maxval, png_maxval);
|
||||
}
|
||||
} else {
|
||||
@@ -2661,10 +2654,10 @@ convertpnm(struct cmdlineInfo const cmdl
|
||||
if (info_ptr->valid && PNG_INFO_tRNS)
|
||||
pm_message("Transparent color {gray, red, green, blue} = "
|
||||
"{%d, %d, %d, %d}",
|
||||
- info_ptr->trans_values.gray,
|
||||
- info_ptr->trans_values.red,
|
||||
- info_ptr->trans_values.green,
|
||||
- info_ptr->trans_values.blue);
|
||||
+ info_ptr->trans_color.gray,
|
||||
+ info_ptr->trans_color.red,
|
||||
+ info_ptr->trans_color.green,
|
||||
+ info_ptr->trans_color.blue);
|
||||
else
|
||||
pm_message("No transparent color");
|
||||
}
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 24 14:04:05 UTC 2011 - pgajdos@novell.com
|
||||
|
||||
- updated to 10.35.80:
|
||||
* asciitopgm: fix bug: memory corruption on too-long lines.
|
||||
* asciitopgm: fix bug: improper handling of blank lines.
|
||||
* pngtopnm: fix bug: -verbose reports history chunk present when
|
||||
it's really a palette.
|
||||
* bmptopnm: Don't crash on invalid zero value of image height in
|
||||
the BMP header of a compressed file.
|
||||
* bmptopnm: don't crash on large invalid value of 'colorsused' in
|
||||
the BMP header.
|
||||
* ilbmtoppm: Don't crash on image that has a transparent color
|
||||
index, but no color map.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 16 15:19:40 CET 2010 - pgajdos@suse.cz
|
||||
|
||||
|
24
netpbm.spec
24
netpbm.spec
@ -30,35 +30,35 @@ AutoReqProv: on
|
||||
Obsoletes: netpbm-64bit
|
||||
%endif
|
||||
#
|
||||
Version: 10.35.77
|
||||
Version: 10.35.80
|
||||
Release: 1
|
||||
Summary: A Powerful Graphics Conversion Package
|
||||
Source: netpbm-%{version}.tar.bz2
|
||||
Source: netpbm-%{version}-nohpcdtoppm-nojbig.tar.bz2
|
||||
Source1: netpbm-%{version}-documentation.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
Source3: prepare-src-tarball
|
||||
# SUSE specific
|
||||
Patch0: %{name}-%{version}-make.patch
|
||||
Patch0: %{name}-make.patch
|
||||
# partially upstreamed in development version
|
||||
Patch1: %{name}-%{version}-manpages.patch
|
||||
Patch1: %{name}-manpages.patch
|
||||
# refused by upstream
|
||||
Patch2: %{name}-%{version}-security.patch
|
||||
Patch2: %{name}-security.patch
|
||||
# refused by upstream
|
||||
Patch3: %{name}-%{version}-security2.patch
|
||||
Patch3: %{name}-security2.patch
|
||||
# refused by upstream
|
||||
Patch4: %{name}-%{version}-pnmtopng-CAN-2978.patch
|
||||
Patch4: %{name}-pnmtopng-CAN-2978.patch
|
||||
# don't know what it does so far
|
||||
Patch5: %{name}-%{version}-tmpfile.patch
|
||||
Patch5: %{name}-tmpfile.patch
|
||||
# upstreamed in development version
|
||||
Patch6: %{name}-%{version}-fixes.patch
|
||||
Patch6: %{name}-fixes.patch
|
||||
# upstreamed in development version (another way)
|
||||
Patch7: %{name}-%{version}-pamscale.patch
|
||||
Patch7: %{name}-pamscale.patch
|
||||
# upstreamed in development version
|
||||
Patch8: %{name}-%{version}-missing-file-close.patch
|
||||
Patch8: %{name}-missing-file-close.patch
|
||||
# no build date
|
||||
Patch9: netpbm-no-build-date.patch
|
||||
# new versions build against libpng14
|
||||
Patch10: %{name}-%{version}-libpng14.patch
|
||||
Patch10: %{name}-libpng14.patch
|
||||
Url: http://netpbm.sourceforge.net
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
rm -rf REMOVE
|
||||
mkdir REMOVE
|
||||
cd REMOVE
|
||||
svn checkout http://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm
|
||||
svn checkout http://netpbm.svn.sourceforge.net/svnroot/netpbm/super_stable netpbm
|
||||
VER=`echo \`cut -f2 -d= netpbm*/Makefile.version \`|sed -e "s| |.|g"`
|
||||
mv netpbm* netpbm-$VER
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user