netpbm: update to 10.71.00.
This commit is contained in:
Christian Neukirchen
parent
10431fbb3f
commit
9f5b24b4a9
|
|
@ -277,26 +277,6 @@ diff -up netpbm-10.58.01/converter/pbm/pbmtolj.c.security-code netpbm-10.58.01/c
|
|||
packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
|
||||
deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
|
||||
|
||||
diff -up netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code netpbm-10.58.01/converter/pbm/pbmtomacp.c
|
||||
--- netpbm-10.58.01/converter/pbm/pbmtomacp.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/pbmtomacp.c 2012-04-09 15:40:03.195619889 +0200
|
||||
@@ -101,6 +101,7 @@ char *argv[];
|
||||
if( !lflg )
|
||||
left = 0;
|
||||
|
||||
+ overflow_add(left, MAX_COLS - 1);
|
||||
if( rflg )
|
||||
{ if( right - left >= MAX_COLS )
|
||||
right = left + MAX_COLS - 1;
|
||||
@@ -111,6 +112,8 @@ char *argv[];
|
||||
if( !tflg )
|
||||
top = 0;
|
||||
|
||||
+ overflow_add(top, MAX_LINES - 1);
|
||||
+
|
||||
if( bflg )
|
||||
{ if( bottom - top >= MAX_LINES )
|
||||
bottom = top + MAX_LINES - 1;
|
||||
diff -up netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code netpbm-10.58.01/converter/pbm/pbmtomda.c
|
||||
--- netpbm-10.58.01/converter/pbm/pbmtomda.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/pbmtomda.c 2012-04-09 15:40:03.195619889 +0200
|
||||
|
|
@ -352,40 +332,6 @@ diff -up netpbm-10.58.01/converter/pbm/pbmtoxbm.c.security-code netpbm-10.58.01/
|
|||
|
||||
putinit(xbmVersion);
|
||||
|
||||
diff -up netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code netpbm-10.58.01/converter/pbm/pbmtoybm.c
|
||||
--- netpbm-10.58.01/converter/pbm/pbmtoybm.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/pbmtoybm.c 2012-04-09 15:40:03.197619863 +0200
|
||||
@@ -113,6 +113,7 @@ main(int argc, const char *argv[]) {
|
||||
bitrow = pbm_allocrow(cols);
|
||||
|
||||
/* Compute padding to round cols up to the nearest multiple of 16. */
|
||||
+ overflow_add(cols, 16);
|
||||
padright = ((cols + 15) / 16) * 16 - cols;
|
||||
|
||||
putinit(cols, rows);
|
||||
diff -up netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code netpbm-10.58.01/converter/pbm/pbmtozinc.c
|
||||
--- netpbm-10.58.01/converter/pbm/pbmtozinc.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/pbmtozinc.c 2012-04-09 15:40:03.197619863 +0200
|
||||
@@ -65,6 +65,7 @@ main(int argc, char * argv[]) {
|
||||
bitrow = pbm_allocrow( cols );
|
||||
|
||||
/* Compute padding to round cols up to the nearest multiple of 16. */
|
||||
+ overflow_add(cols, 16);
|
||||
padright = ( ( cols + 15 ) / 16 ) * 16 - cols;
|
||||
|
||||
printf( "USHORT %s[] = {\n",name);
|
||||
diff -up netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code netpbm-10.58.01/converter/pbm/pbmto10x.c
|
||||
--- netpbm-10.58.01/converter/pbm/pbmto10x.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/pbmto10x.c 2012-04-09 15:40:03.197619863 +0200
|
||||
@@ -162,7 +162,7 @@ main(int argc, char * argv[]) {
|
||||
res_60x72();
|
||||
|
||||
pm_close(ifp);
|
||||
- exit(0);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
|
||||
diff -up netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code netpbm-10.58.01/converter/pbm/pbmto4425.c
|
||||
--- netpbm-10.58.01/converter/pbm/pbmto4425.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/pbmto4425.c 2012-04-09 15:40:03.198619851 +0200
|
||||
|
|
@ -439,17 +385,6 @@ diff -up netpbm-10.58.01/converter/pbm/thinkjettopbm.l.security-code netpbm-10.5
|
|||
pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
|
||||
|
||||
packed_bitrow = malloc(maxRowLength);
|
||||
diff -up netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code netpbm-10.58.01/converter/pbm/ybmtopbm.c
|
||||
--- netpbm-10.58.01/converter/pbm/ybmtopbm.c.security-code 2012-04-09 15:31:45.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pbm/ybmtopbm.c 2012-04-09 15:40:03.199619839 +0200
|
||||
@@ -49,6 +49,7 @@ getinit(FILE * const ifP,
|
||||
pm_error("EOF / read error");
|
||||
|
||||
*depthP = 1;
|
||||
+ overflow_add(*colsP, 15);
|
||||
*padrightP = ((*colsP + 15) / 16) * 16 - *colsP;
|
||||
}
|
||||
|
||||
diff -up netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code netpbm-10.58.01/converter/pgm/lispmtopgm.c
|
||||
--- netpbm-10.58.01/converter/pgm/lispmtopgm.c.security-code 2012-04-09 15:31:42.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/pgm/lispmtopgm.c 2012-04-09 15:40:03.199619839 +0200
|
||||
|
|
@ -678,18 +613,6 @@ diff -up netpbm-10.58.01/converter/ppm/ppmtoeyuv.c.security-code netpbm-10.58.01
|
|||
MALLOCARRAY_NOFAIL(mult299 , maxval+1);
|
||||
MALLOCARRAY_NOFAIL(mult587 , maxval+1);
|
||||
MALLOCARRAY_NOFAIL(mult114 , maxval+1);
|
||||
diff -up netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code netpbm-10.58.01/converter/ppm/ppmtoicr.c
|
||||
--- netpbm-10.58.01/converter/ppm/ppmtoicr.c.security-code 2012-04-09 15:31:44.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/ppm/ppmtoicr.c 2012-04-09 15:40:03.207619739 +0200
|
||||
@@ -169,7 +169,7 @@ char* argv[];
|
||||
|
||||
if (rleflag) {
|
||||
pm_message("sending run-length encoded picture data ..." );
|
||||
- testimage = (char*) malloc(rows*cols);
|
||||
+ testimage = (char*) malloc2(rows, cols);
|
||||
p = testimage;
|
||||
for (i=0; i<rows; i++)
|
||||
for (j=0; j<cols; j++)
|
||||
diff -up netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code netpbm-10.58.01/converter/ppm/ppmtoilbm.c
|
||||
--- netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code 2012-04-09 15:31:42.000000000 +0200
|
||||
+++ netpbm-10.58.01/converter/ppm/ppmtoilbm.c 2012-04-09 15:40:03.208619727 +0200
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'netpbm'
|
||||
pkgname=netpbm
|
||||
# from http://svn.code.sf.net/p/netpbm/code/advanced/doc/HISTORY
|
||||
version=10.70.07
|
||||
version=10.71.00
|
||||
revision=1
|
||||
_githash=8c2dab4922b514045cbae8e71ba93aaf8c0fff48
|
||||
_githash_guide=05d90b5751834001111037fa84a39bd9010061b8
|
||||
_githash=620ecbee2ed1cb478e0289722d86dd72717f1cb8
|
||||
_githash_guide=676ee319f5dbab5210d073df72f98f2bddc3b570
|
||||
create_wrksrc=yes
|
||||
build_wrksrc="netpbm-mirror-${_githash}"
|
||||
hostmakedepends="pkg-config perl python flex"
|
||||
|
|
@ -16,14 +16,15 @@ homepage="http://netpbm.sourceforge.net/"
|
|||
nocross=yes
|
||||
distfiles="https://github.com/chneukirchen/netpbm-mirror/archive/${_githash}.tar.gz
|
||||
https://github.com/chneukirchen/netpbm-mirror/archive/${_githash_guide}.tar.gz"
|
||||
checksum="18e76dfd255506f08e13fa3620f742e74ba1208253717421fec71f0499956263
|
||||
28bd623d2e18748ec425b46118f3ee3db65ce54dd3a4d9cfd9ccfc9a066c844a"
|
||||
checksum="1e09f026ea9690d577bd59ccf35d5a29c322682e51de0694f2d9c3bdc8db78aa
|
||||
93d7c16c64939e525fe605295bc2443f601ea0d8cf36c5914cac814e95489c60"
|
||||
|
||||
post_extract() {
|
||||
cd $build_wrksrc
|
||||
for p in ${FILESDIR}/*.patch; do
|
||||
patch -Np1 -i $p
|
||||
done
|
||||
sed -i 's/"\\"/"\\\\"/g' buildtools/makeman
|
||||
}
|
||||
|
||||
do_configure() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue