pool/netpbm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated to 10.72.4

Browse Source 
* see HISTORY for upstrem changelog 
  * added useful returns
    + netpbm-gcc-warnings.patch
  * forwardported
    . netpbm-security-code.patch

OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=70
This commit is contained in:
Petr Gajdos 2015-12-17 11:36:34 +00:00 committed by Git OBS Bridge
parent 72bf0b6173
commit 5bfbf366da
8 changed files with 219 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netpbm-10.70.4-documentation.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c2d0f1b87e86230149df5c80bbd5103a95cbb26714534dddf4cafd1a41fb214
size 599374

3
netpbm-10.70.4-nohpcdtoppm-noppmtompeg.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b439d83358753df5623e48495e7762541253a76df39ba8a739e2d160477991f
size 1826029

3
netpbm-10.72.4-documentation.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7db36781d033e1f56a818d7686dbdd6aae9dd17ba16feaf5de144e7bf750bebc
size 604126

3
netpbm-10.72.4-nohpcdtoppm-noppmtompeg.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce3e91e06925c6b97293a153157ccc74669d2a92f7ea9ab0e238c4e527bb1ad0
size 1838452

20
netpbm-gcc-warnings.patch Normal file
View File

@ -0,0 +1,20 @@
Index: converter/other/pngx.c
===================================================================
--- converter/other/pngx.c.orig 2015-12-16 17:11:26.246357467 +0100
+++ converter/other/pngx.c 2015-12-17 12:16:50.793565778 +0100
@@ -342,6 +342,7 @@
case PNGX_ABSOLUTE_COLORIMETRIC: return "ABSOLUTE_COLORIMETRIC";
}
assert(false);
+ return NULL;
}
@@ -357,6 +358,7 @@
}
assert(false); /* All cases above return */
+ return -1;
}

446
netpbm-security-code.patch
View File

@ -1,7 +1,7 @@
Index: analyzer/pgmtexture.c
===================================================================
--- analyzer/pgmtexture.c.orig 2015-05-11 16:40:38.044248332 +0200
+++ analyzer/pgmtexture.c 2015-05-11 16:44:16.563125788 +0200
--- analyzer/pgmtexture.c.orig 2015-12-16 17:11:24.394357488 +0100
+++ analyzer/pgmtexture.c 2015-12-17 09:45:59.977670041 +0100
@@ -97,7 +97,7 @@
float * v;
@ -30,8 +30,8 @@ Index: analyzer/pgmtexture.c
MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
Index: converter/other/gemtopnm.c
===================================================================
--- converter/other/gemtopnm.c.orig 2015-05-11 16:40:41.646295767 +0200
+++ converter/other/gemtopnm.c 2015-05-11 16:44:16.564125804 +0200
--- converter/other/gemtopnm.c.orig 2015-12-16 17:11:27.010357458 +0100
+++ converter/other/gemtopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -106,6 +106,7 @@
pnm_writepnminit( stdout, cols, rows, MAXVAL, type, 0 );
@ -42,8 +42,8 @@ Index: converter/other/gemtopnm.c
int plane;
Index: converter/other/jpegtopnm.c
===================================================================
--- converter/other/jpegtopnm.c.orig 2015-05-11 16:40:40.801284640 +0200
+++ converter/other/jpegtopnm.c 2015-05-11 16:44:16.564125804 +0200
--- converter/other/jpegtopnm.c.orig 2015-12-16 17:11:26.170357468 +0100
+++ converter/other/jpegtopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -861,6 +861,8 @@
/* Calculate output image dimensions so we can allocate space */
jpeg_calc_output_dimensions(cinfoP);
@ -55,8 +55,8 @@ Index: converter/other/jpegtopnm.c
Index: converter/other/pbmtopgm.c
===================================================================
--- converter/other/pbmtopgm.c.orig 2015-05-11 16:40:41.646295767 +0200
+++ converter/other/pbmtopgm.c 2015-05-11 16:44:16.564125804 +0200
--- converter/other/pbmtopgm.c.orig 2015-12-16 17:11:27.010357458 +0100
+++ converter/other/pbmtopgm.c 2015-12-17 09:45:59.977670041 +0100
@@ -47,6 +47,7 @@
"than the image height (%u rows)", height, rows);
@ -67,8 +67,8 @@ Index: converter/other/pbmtopgm.c
Index: converter/other/pnmtoddif.c
===================================================================
--- converter/other/pnmtoddif.c.orig 2015-05-11 16:40:41.715296676 +0200
+++ converter/other/pnmtoddif.c 2015-05-11 16:44:16.565125819 +0200
--- converter/other/pnmtoddif.c.orig 2015-12-16 17:11:27.042357458 +0100
+++ converter/other/pnmtoddif.c 2015-12-17 09:45:59.977670041 +0100
@@ -632,6 +632,7 @@
switch (PNM_FORMAT_TYPE(format)) {
case PBM_TYPE:
@ -87,8 +87,8 @@ Index: converter/other/pnmtoddif.c
ip.spectral = 5;
Index: converter/other/pnmtojpeg.c
===================================================================
--- converter/other/pnmtojpeg.c.orig 2015-05-11 16:40:40.240277250 +0200
+++ converter/other/pnmtojpeg.c 2015-05-11 16:44:16.565125819 +0200
--- converter/other/pnmtojpeg.c.orig 2015-12-16 17:11:25.714357473 +0100
+++ converter/other/pnmtojpeg.c 2015-12-17 09:45:59.977670041 +0100
@@ -605,7 +605,11 @@
want JPOOL_PERMANENT.
*/
@ -121,9 +121,9 @@ Index: converter/other/pnmtojpeg.c
(unsigned int) cinfo_p->image_width * cinfo_p->input_components,
Index: converter/other/pnmtops.c
===================================================================
--- converter/other/pnmtops.c.orig 2015-05-11 16:40:40.800284628 +0200
+++ converter/other/pnmtops.c 2015-05-11 16:44:16.565125819 +0200
@@ -292,17 +292,21 @@
--- converter/other/pnmtops.c.orig 2015-12-16 17:11:26.170357468 +0100
+++ converter/other/pnmtops.c 2015-12-17 09:45:59.977670041 +0100
@@ -293,17 +293,21 @@
validateCompDimension(width, 72, "-width value");
validateCompDimension(height, 72, "-height value");
@ -148,8 +148,8 @@ Index: converter/other/pnmtops.c
else
Index: converter/other/pnmtorle.c
===================================================================
--- converter/other/pnmtorle.c.orig 2015-05-11 16:40:41.643295727 +0200
+++ converter/other/pnmtorle.c 2015-05-11 16:44:16.565125819 +0200
--- converter/other/pnmtorle.c.orig 2015-12-16 17:11:27.006357458 +0100
+++ converter/other/pnmtorle.c 2015-12-17 09:45:59.977670041 +0100
@@ -19,6 +19,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -161,30 +161,20 @@ Index: converter/other/pnmtorle.c
* pnmtorle - A program which will convert pbmplus (ppm or pgm) images
Index: converter/other/pnmtosgi.c
===================================================================
--- converter/other/pnmtosgi.c.orig 2015-05-11 16:40:41.648295793 +0200
+++ converter/other/pnmtosgi.c 2015-05-11 16:44:16.566125832 +0200
@@ -180,6 +180,9 @@
/* writes result into rletemp */
unsigned int i;
ScanElem * p;
+
+ overflow2(chanNum, rows);
+ overflow_add(chanNum * rows, row);
channel[chanNum][row].length = len;
MALLOCARRAY(p, len);
@@ -212,6 +215,7 @@
--- converter/other/pnmtosgi.c.orig 2015-12-16 17:11:27.010357458 +0100
+++ converter/other/pnmtosgi.c 2015-12-17 09:45:59.977670041 +0100
@@ -185,6 +185,7 @@
ScanElem * temp;
if (storage != STORAGE_VERBATIM) {
+ overflow2(channels, rows);
MALLOCARRAY_NOFAIL(table, channels * rows);
MALLOCARRAY_NOFAIL(rletemp, WORSTCOMPR(cols));
} else
table = NULL;
Index: converter/other/rletopnm.c
===================================================================
--- converter/other/rletopnm.c.orig 2015-05-11 16:40:41.643295727 +0200
+++ converter/other/rletopnm.c 2015-05-11 16:44:16.566125832 +0200
--- converter/other/rletopnm.c.orig 2015-12-16 17:11:27.006357458 +0100
+++ converter/other/rletopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -19,6 +19,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -196,9 +186,9 @@ Index: converter/other/rletopnm.c
* rletopnm - A conversion program to convert from Utah's "rle" image format
Index: converter/other/sgitopnm.c
===================================================================
--- converter/other/sgitopnm.c.orig 2015-05-11 16:40:41.648295793 +0200
+++ converter/other/sgitopnm.c 2015-05-11 16:44:16.566125832 +0200
@@ -372,10 +372,14 @@
--- converter/other/sgitopnm.c.orig 2015-12-16 17:11:27.010357458 +0100
+++ converter/other/sgitopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -377,10 +377,14 @@
MALLOCARRAY_NOFAIL(image, head->ysize);
} else {
maxchannel = 3;
@ -216,8 +206,8 @@ Index: converter/other/sgitopnm.c
unsigned int row;
Index: converter/other/sirtopnm.c
===================================================================
--- converter/other/sirtopnm.c.orig 2015-05-11 16:40:41.644295740 +0200
+++ converter/other/sirtopnm.c 2015-05-11 16:44:16.566125832 +0200
--- converter/other/sirtopnm.c.orig 2015-12-16 17:11:27.006357458 +0100
+++ converter/other/sirtopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -69,6 +69,7 @@
}
break;
@ -228,8 +218,8 @@ Index: converter/other/sirtopnm.c
if ( !( sirarray = (unsigned char*) malloc( picsize ) ) )
Index: converter/other/tifftopnm.c
===================================================================
--- converter/other/tifftopnm.c.orig 2015-05-11 16:40:41.649295806 +0200
+++ converter/other/tifftopnm.c 2015-05-11 16:44:16.567125842 +0200
--- converter/other/tifftopnm.c.orig 2015-12-16 17:11:27.010357458 +0100
+++ converter/other/tifftopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -1309,7 +1309,9 @@
if (scanbuf == NULL)
pm_error("can't allocate memory for scanline buffer");
@ -243,8 +233,8 @@ Index: converter/other/tifftopnm.c
Index: converter/other/xwdtopnm.c
===================================================================
--- converter/other/xwdtopnm.c.orig 2015-05-11 16:40:40.935286404 +0200
+++ converter/other/xwdtopnm.c 2015-05-11 16:44:16.567125842 +0200
--- converter/other/xwdtopnm.c.orig 2015-12-16 17:11:26.246357467 +0100
+++ converter/other/xwdtopnm.c 2015-12-17 09:45:59.977670041 +0100
@@ -209,6 +209,10 @@
*colorsP = pnm_allocrow(2);
PNM_ASSIGN1((*colorsP)[0], 0);
@ -266,8 +256,8 @@ Index: converter/other/xwdtopnm.c
h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
Index: converter/pbm/mdatopbm.c
===================================================================
--- converter/pbm/mdatopbm.c.orig 2015-05-11 16:40:43.009313716 +0200
+++ converter/pbm/mdatopbm.c 2015-05-11 16:44:16.567125842 +0200
--- converter/pbm/mdatopbm.c.orig 2015-12-16 17:11:28.506357441 +0100
+++ converter/pbm/mdatopbm.c 2015-12-17 09:45:59.977670041 +0100
@@ -245,10 +245,13 @@
pm_readlittleshort(infile, &yy); nInCols = yy;
}
@ -285,8 +275,8 @@ Index: converter/pbm/mdatopbm.c
Index: converter/pbm/mgrtopbm.c
===================================================================
--- converter/pbm/mgrtopbm.c.orig 2015-05-11 16:40:43.104314967 +0200
+++ converter/pbm/mgrtopbm.c 2015-05-11 16:44:16.567125842 +0200
--- converter/pbm/mgrtopbm.c.orig 2015-12-16 17:11:28.566357440 +0100
+++ converter/pbm/mgrtopbm.c 2015-12-17 09:45:59.981670041 +0100
@@ -65,6 +65,8 @@
if (head.h_high < ' ' || head.l_high < ' ')
pm_error("Invalid width field in MGR header");
@ -298,8 +288,8 @@ Index: converter/pbm/mgrtopbm.c
*padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
Index: converter/pbm/pbmtogem.c
===================================================================
--- converter/pbm/pbmtogem.c.orig 2015-05-11 16:40:43.010313730 +0200
+++ converter/pbm/pbmtogem.c 2015-05-11 16:44:16.568125853 +0200
--- converter/pbm/pbmtogem.c.orig 2015-12-16 17:11:28.506357441 +0100
+++ converter/pbm/pbmtogem.c 2015-12-17 09:45:59.981670041 +0100
@@ -79,6 +79,7 @@
bitsperitem = 0;
bitshift = 7;
@ -310,8 +300,8 @@ Index: converter/pbm/pbmtogem.c
lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
Index: converter/pbm/pbmtogo.c
===================================================================
--- converter/pbm/pbmtogo.c.orig 2015-05-11 16:40:43.101314927 +0200
+++ converter/pbm/pbmtogo.c 2015-05-11 16:44:16.568125853 +0200
--- converter/pbm/pbmtogo.c.orig 2015-12-16 17:11:28.566357440 +0100
+++ converter/pbm/pbmtogo.c 2015-12-17 09:45:59.981670041 +0100
@@ -158,6 +158,7 @@
bitrow = pbm_allocrow(cols);
@ -322,8 +312,8 @@ Index: converter/pbm/pbmtogo.c
rucols = rucols * 8;
Index: converter/pbm/pbmtolj.c
===================================================================
--- converter/pbm/pbmtolj.c.orig 2015-05-11 16:40:43.010313730 +0200
+++ converter/pbm/pbmtolj.c 2015-05-11 16:44:16.568125853 +0200
--- converter/pbm/pbmtolj.c.orig 2015-12-16 17:11:28.506357441 +0100
+++ converter/pbm/pbmtolj.c 2015-12-17 09:45:59.981670041 +0100
@@ -120,7 +120,11 @@
static void
allocateBuffers(unsigned int const cols) {
@ -336,31 +326,10 @@ Index: converter/pbm/pbmtolj.c
packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
Index: converter/pbm/pbmtomacp.c
===================================================================
--- converter/pbm/pbmtomacp.c.orig 2015-05-11 16:40:43.013313768 +0200
+++ converter/pbm/pbmtomacp.c 2015-05-11 16:44:16.568125853 +0200
@@ -100,6 +100,7 @@
if( !lflg )
left = 0;
+ overflow_add(left, MAX_COLS - 1);
if( rflg )
{ if( right - left >= MAX_COLS )
right = left + MAX_COLS - 1;
@@ -110,6 +111,8 @@
if( !tflg )
top = 0;
+ overflow_add(top, MAX_LINES - 1);
+
if( bflg )
{ if( bottom - top >= MAX_LINES )
bottom = top + MAX_LINES - 1;
Index: converter/pbm/pbmtomda.c
===================================================================
--- converter/pbm/pbmtomda.c.orig 2015-05-11 16:40:43.101314927 +0200
+++ converter/pbm/pbmtomda.c 2015-05-11 16:44:16.568125853 +0200
--- converter/pbm/pbmtomda.c.orig 2015-12-16 17:11:28.566357440 +0100
+++ converter/pbm/pbmtomda.c 2015-12-17 09:45:59.981670041 +0100
@@ -179,6 +179,7 @@
nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
@ -371,9 +340,9 @@ Index: converter/pbm/pbmtomda.c
nOutCols = nInCols / 8;
Index: converter/pbm/pbmtoppa/pbm.c
===================================================================
--- converter/pbm/pbmtoppa/pbm.c.orig 2015-05-11 16:40:43.016313808 +0200
+++ converter/pbm/pbmtoppa/pbm.c 2015-05-11 16:44:16.568125853 +0200
@@ -105,6 +105,7 @@
--- converter/pbm/pbmtoppa/pbm.c.orig 2015-12-16 17:11:28.510357441 +0100
+++ converter/pbm/pbmtoppa/pbm.c 2015-12-17 09:45:59.981670041 +0100
@@ -106,6 +106,7 @@
return 0;
case P4:
@ -381,7 +350,7 @@ Index: converter/pbm/pbmtoppa/pbm.c
tmp=(pbm->width+7)/8;
tmp2=fread(data,1,tmp,pbm->fptr);
if(tmp2 == tmp)
@@ -129,7 +130,8 @@
@@ -130,7 +131,8 @@
return;
pbm->unread = 1;
@ -393,9 +362,9 @@ Index: converter/pbm/pbmtoppa/pbm.c
}
Index: converter/pbm/pbmtoppa/pbmtoppa.c
===================================================================
--- converter/pbm/pbmtoppa/pbmtoppa.c.orig 2015-05-11 16:40:43.017313822 +0200
+++ converter/pbm/pbmtoppa/pbmtoppa.c 2015-05-11 16:44:16.569125863 +0200
@@ -441,6 +441,7 @@
--- converter/pbm/pbmtoppa/pbmtoppa.c.orig 2015-12-16 17:11:28.510357441 +0100
+++ converter/pbm/pbmtoppa/pbmtoppa.c 2015-12-17 09:45:59.981670041 +0100
@@ -452,6 +452,7 @@
pm_error("main(): unrecognized parameter '%s'", argv[argn]);
}
@ -405,9 +374,9 @@ Index: converter/pbm/pbmtoppa/pbmtoppa.c
Index: converter/pbm/pbmtoxbm.c
===================================================================
--- converter/pbm/pbmtoxbm.c.orig 2015-05-11 16:40:43.104314967 +0200
+++ converter/pbm/pbmtoxbm.c 2015-05-11 16:44:16.569125863 +0200
@@ -335,6 +335,8 @@
--- converter/pbm/pbmtoxbm.c.orig 2015-12-16 17:11:28.566357440 +0100
+++ converter/pbm/pbmtoxbm.c 2015-12-17 09:45:59.981670041 +0100
@@ -351,6 +351,8 @@
unsigned char * bitrow;
unsigned int row;
@ -416,47 +385,10 @@ Index: converter/pbm/pbmtoxbm.c
putinit(xbmVersion);
Index: converter/pbm/pbmtoybm.c
===================================================================
--- converter/pbm/pbmtoybm.c.orig 2015-05-11 16:40:43.105314980 +0200
+++ converter/pbm/pbmtoybm.c 2015-05-11 16:44:16.569125863 +0200
@@ -113,6 +113,7 @@
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);
Index: converter/pbm/pbmtozinc.c
===================================================================
--- converter/pbm/pbmtozinc.c.orig 2015-05-11 16:40:43.101314927 +0200
+++ converter/pbm/pbmtozinc.c 2015-05-11 16:44:16.569125863 +0200
@@ -65,6 +65,7 @@
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);
Index: converter/pbm/pbmto10x.c
===================================================================
--- converter/pbm/pbmto10x.c.orig 2015-05-11 16:40:43.010313730 +0200
+++ converter/pbm/pbmto10x.c 2015-05-11 16:44:16.569125863 +0200
@@ -162,7 +162,7 @@
res_60x72();
pm_close(ifp);
- exit(0);
+ return 0;
}
Index: converter/pbm/pbmto4425.c
===================================================================
--- converter/pbm/pbmto4425.c.orig 2015-05-11 16:40:43.009313716 +0200
+++ converter/pbm/pbmto4425.c 2015-05-11 16:44:16.569125863 +0200
--- converter/pbm/pbmto4425.c.orig 2015-12-16 17:11:28.506357441 +0100
+++ converter/pbm/pbmto4425.c 2015-12-17 09:45:59.981670041 +0100
@@ -2,6 +2,7 @@
#include "nstring.h"
@ -476,9 +408,9 @@ Index: converter/pbm/pbmto4425.c
pm_error( "Cannot allocate memory" );
Index: converter/pbm/pktopbm.c
===================================================================
--- converter/pbm/pktopbm.c.orig 2015-05-11 16:40:43.011313743 +0200
+++ converter/pbm/pktopbm.c 2015-05-11 16:44:16.570125875 +0200
@@ -277,6 +277,7 @@
--- converter/pbm/pktopbm.c.orig 2015-12-16 17:11:28.506357441 +0100
+++ converter/pbm/pktopbm.c 2015-12-17 09:45:59.981670041 +0100
@@ -280,6 +280,7 @@
if (flagbyte == 7) { /* long form preamble */
integer packetlength = get32() ; /* character packet length */
car = get32() ; /* character number */
@ -488,8 +420,8 @@ Index: converter/pbm/pktopbm.c
if ((car >= MAXPKCHAR) || !filename[car]) {
Index: converter/pbm/thinkjettopbm.l
===================================================================
--- converter/pbm/thinkjettopbm.l.orig 2015-05-11 16:40:43.105314980 +0200
+++ converter/pbm/thinkjettopbm.l 2015-05-11 16:44:16.570125875 +0200
--- converter/pbm/thinkjettopbm.l.orig 2015-12-16 17:11:28.566357440 +0100
+++ converter/pbm/thinkjettopbm.l 2015-12-17 09:45:59.981670041 +0100
@@ -114,7 +114,9 @@
<RASTERMODE>\033\*b{DIG}+W {
int l;
@ -509,22 +441,10 @@ Index: converter/pbm/thinkjettopbm.l
pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
packed_bitrow = malloc(maxRowLength);
Index: converter/pbm/ybmtopbm.c
===================================================================
--- converter/pbm/ybmtopbm.c.orig 2015-05-11 16:40:43.014313781 +0200
+++ converter/pbm/ybmtopbm.c 2015-05-11 16:44:16.570125875 +0200
@@ -49,6 +49,7 @@
pm_error("EOF / read error");
*depthP = 1;
+ overflow_add(*colsP, 15);
*padrightP = ((*colsP + 15) / 16) * 16 - *colsP;
}
Index: converter/pgm/lispmtopgm.c
===================================================================
--- converter/pgm/lispmtopgm.c.orig 2015-05-11 16:40:41.883298891 +0200
+++ converter/pgm/lispmtopgm.c 2015-05-11 16:44:16.570125875 +0200
--- converter/pgm/lispmtopgm.c.orig 2015-12-16 17:11:27.170357456 +0100
+++ converter/pgm/lispmtopgm.c 2015-12-17 09:45:59.981670041 +0100
@@ -58,6 +58,7 @@
pm_error( "depth (%d bits) is too large", depth);
@ -546,8 +466,8 @@ Index: converter/pgm/lispmtopgm.c
if ( *colsP != (cols_32 - *padrightP) ) {
Index: converter/pgm/psidtopgm.c
===================================================================
--- converter/pgm/psidtopgm.c.orig 2015-05-11 16:40:41.881298871 +0200
+++ converter/pgm/psidtopgm.c 2015-05-11 16:44:16.570125875 +0200
--- converter/pgm/psidtopgm.c.orig 2015-12-16 17:11:27.170357456 +0100
+++ converter/pgm/psidtopgm.c 2015-12-17 09:45:59.981670041 +0100
@@ -78,6 +78,7 @@
pm_error("bits/sample (%d) is too large.", bitspersample);
@ -558,8 +478,8 @@ Index: converter/pgm/psidtopgm.c
unsigned int col;
Index: converter/ppm/ilbmtoppm.c
===================================================================
--- converter/ppm/ilbmtoppm.c.orig 2015-05-11 16:40:42.855311688 +0200
+++ converter/ppm/ilbmtoppm.c 2015-05-11 16:44:16.571125890 +0200
--- converter/ppm/ilbmtoppm.c.orig 2015-12-16 17:11:28.362357443 +0100
+++ converter/ppm/ilbmtoppm.c 2015-12-17 09:45:59.981670041 +0100
@@ -606,6 +606,7 @@
rawtype *chp;
@ -632,8 +552,8 @@ Index: converter/ppm/ilbmtoppm.c
Index: converter/ppm/imgtoppm.c
===================================================================
--- converter/ppm/imgtoppm.c.orig 2015-05-11 16:40:42.638308830 +0200
+++ converter/ppm/imgtoppm.c 2015-05-11 16:44:16.571125890 +0200
--- converter/ppm/imgtoppm.c.orig 2015-12-16 17:11:28.138357445 +0100
+++ converter/ppm/imgtoppm.c 2015-12-17 09:45:59.985670041 +0100
@@ -84,6 +84,7 @@
len = atoi((char*) buf );
if ( fread( buf, len, 1, ifp ) != 1 )
@ -652,8 +572,8 @@ Index: converter/ppm/imgtoppm.c
"pixel data length (%d) does not match image size (%d)",
Index: converter/ppm/Makefile
===================================================================
--- converter/ppm/Makefile.orig 2015-05-11 16:40:42.638308830 +0200
+++ converter/ppm/Makefile 2015-05-11 16:44:16.571125890 +0200
--- converter/ppm/Makefile.orig 2015-12-16 17:11:28.138357445 +0100
+++ converter/ppm/Makefile 2015-12-17 09:45:59.985670041 +0100
@@ -11,7 +11,7 @@
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
@ -665,8 +585,8 @@ Index: converter/ppm/Makefile
ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
Index: converter/ppm/pcxtoppm.c
===================================================================
--- converter/ppm/pcxtoppm.c.orig 2015-05-11 16:40:42.856311701 +0200
+++ converter/ppm/pcxtoppm.c 2015-05-11 16:44:16.571125890 +0200
--- converter/ppm/pcxtoppm.c.orig 2015-12-16 17:11:28.366357443 +0100
+++ converter/ppm/pcxtoppm.c 2015-12-17 09:45:59.985670041 +0100
@@ -409,6 +409,7 @@
/*
* clear the pixel buffer
@ -685,8 +605,8 @@ Index: converter/ppm/pcxtoppm.c
pm_message("warning - BytesPerLine = %d, "
Index: converter/ppm/picttoppm.c
===================================================================
--- converter/ppm/picttoppm.c.orig 2015-05-11 16:40:42.856311701 +0200
+++ converter/ppm/picttoppm.c 2015-05-11 16:44:16.572125907 +0200
--- converter/ppm/picttoppm.c.orig 2015-12-16 17:11:28.366357443 +0100
+++ converter/ppm/picttoppm.c 2015-12-17 09:45:59.985670041 +0100
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
@ -695,8 +615,8 @@ Index: converter/ppm/picttoppm.c
*
Index: converter/ppm/pjtoppm.c
===================================================================
--- converter/ppm/pjtoppm.c.orig 2015-05-11 16:40:42.850311622 +0200
+++ converter/ppm/pjtoppm.c 2015-05-11 16:44:16.572125907 +0200
--- converter/ppm/pjtoppm.c.orig 2015-12-16 17:11:28.362357443 +0100
+++ converter/ppm/pjtoppm.c 2015-12-17 09:45:59.985670041 +0100
@@ -127,19 +127,21 @@
case 'V': /* send plane */
case 'W': /* send last plane */
@ -748,8 +668,8 @@ Index: converter/ppm/pjtoppm.c
Index: converter/ppm/ppmtoeyuv.c
===================================================================
--- converter/ppm/ppmtoeyuv.c.orig 2015-05-11 16:40:42.018300670 +0200
+++ converter/ppm/ppmtoeyuv.c 2015-05-11 16:44:16.573125921 +0200
--- converter/ppm/ppmtoeyuv.c.orig 2015-12-16 17:11:27.314357455 +0100
+++ converter/ppm/ppmtoeyuv.c 2015-12-17 09:45:59.985670041 +0100
@@ -114,6 +114,7 @@
int index;
@ -758,24 +678,11 @@ Index: converter/ppm/ppmtoeyuv.c
MALLOCARRAY_NOFAIL(mult299 , maxval+1);
MALLOCARRAY_NOFAIL(mult587 , maxval+1);
MALLOCARRAY_NOFAIL(mult114 , maxval+1);
Index: converter/ppm/ppmtoicr.c
===================================================================
--- converter/ppm/ppmtoicr.c.orig 2015-05-11 16:40:42.638308830 +0200
+++ converter/ppm/ppmtoicr.c 2015-05-11 16:44:16.573125921 +0200
@@ -169,7 +169,7 @@
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++)
Index: converter/ppm/ppmtoilbm.c
===================================================================
--- converter/ppm/ppmtoilbm.c.orig 2015-05-11 16:40:42.017300655 +0200
+++ converter/ppm/ppmtoilbm.c 2015-05-11 16:44:16.573125921 +0200
@@ -185,6 +185,7 @@
--- converter/ppm/ppmtoilbm.c.orig 2015-12-16 17:11:27.314357455 +0100
+++ converter/ppm/ppmtoilbm.c 2015-12-17 10:15:15.469649818 +0100
@@ -190,6 +190,7 @@
unsigned int i;
int * table;
@ -783,7 +690,7 @@ Index: converter/ppm/ppmtoilbm.c
MALLOCARRAY_NOFAIL(table, oldmaxval + 1);
for (i = 0; i <= oldmaxval; ++i)
table[i] = ROUNDDIV(i * newmaxval, oldmaxval);
@@ -1675,6 +1676,7 @@
@@ -1644,6 +1645,7 @@
maskmethod = 0; /* no masking - RGB8 uses genlock bits */
compmethod = 4; /* RGB8 files are always compressed */
@ -791,7 +698,7 @@ Index: converter/ppm/ppmtoilbm.c
MALLOCARRAY_NOFAIL(compr_row, cols * 4);
if( maxval != 255 ) {
@@ -1766,6 +1768,7 @@
@@ -1735,6 +1737,7 @@
maskmethod = 0; /* no masking - RGBN uses genlock bits */
compmethod = 4; /* RGBN files are always compressed */
@ -799,23 +706,22 @@ Index: converter/ppm/ppmtoilbm.c
MALLOCARRAY_NOFAIL(compr_row, cols * 2);
if( maxval != 15 ) {
@@ -2328,8 +2331,11 @@
@@ -2298,8 +2301,10 @@
MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols));
for (i = 0; i < RowBytes(cols); ++i)
coded_rowbuf[i] = 0;
- if (DO_COMPRESS)
+ if (DO_COMPRESS) {
+ overflow2(cols,2);
+ overflow_add(cols*2,2);
MALLOCARRAY_NOFAIL(compr_rowbuf, WORSTCOMPR(RowBytes(cols)));
+ overflow_add(cols,15);
pm_rlenc_allocoutbuf(&compr_rowbuf, RowBytes(cols), PM_RLE_PACKBITS);
+ }
}
switch (mode) {
Index: converter/ppm/ppmtolj.c
===================================================================
--- converter/ppm/ppmtolj.c.orig 2015-05-11 16:40:42.019300682 +0200
+++ converter/ppm/ppmtolj.c 2015-05-11 16:44:16.573125921 +0200
--- converter/ppm/ppmtolj.c.orig 2015-12-16 17:11:27.314357455 +0100
+++ converter/ppm/ppmtolj.c 2015-12-17 09:45:59.985670041 +0100
@@ -181,7 +181,8 @@
ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
@ -828,8 +734,8 @@ Index: converter/ppm/ppmtolj.c
if (mode == C_TRANS_MODE_DELTA)
Index: converter/ppm/ppmtomitsu.c
===================================================================
--- converter/ppm/ppmtomitsu.c.orig 2015-05-11 16:40:42.849311609 +0200
+++ converter/ppm/ppmtomitsu.c 2015-05-11 16:44:16.574125934 +0200
--- converter/ppm/ppmtomitsu.c.orig 2015-12-16 17:11:28.358357443 +0100
+++ converter/ppm/ppmtomitsu.c 2015-12-17 09:45:59.985670041 +0100
@@ -685,6 +685,8 @@
medias = MSize_User;
@ -841,9 +747,9 @@ Index: converter/ppm/ppmtomitsu.c
}
Index: converter/ppm/ppmtopcx.c
===================================================================
--- converter/ppm/ppmtopcx.c.orig 2015-05-11 16:40:42.639308843 +0200
+++ converter/ppm/ppmtopcx.c 2015-05-11 16:44:16.574125934 +0200
@@ -419,6 +419,8 @@
--- converter/ppm/ppmtopcx.c.orig 2015-12-16 17:11:28.142357445 +0100
+++ converter/ppm/ppmtopcx.c 2015-12-17 09:45:59.985670041 +0100
@@ -425,6 +425,8 @@
else Planes = 1;
}
}
@ -854,8 +760,8 @@ Index: converter/ppm/ppmtopcx.c
MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
Index: converter/ppm/ppmtopict.c
===================================================================
--- converter/ppm/ppmtopict.c.orig 2015-05-11 16:40:42.019300682 +0200
+++ converter/ppm/ppmtopict.c 2015-05-11 16:44:16.574125934 +0200
--- converter/ppm/ppmtopict.c.orig 2015-12-16 17:11:27.314357455 +0100
+++ converter/ppm/ppmtopict.c 2015-12-17 09:45:59.985670041 +0100
@@ -450,6 +450,8 @@
putShort(stdout, 0); /* mode */
@ -867,8 +773,8 @@ Index: converter/ppm/ppmtopict.c
unsigned int rowSize;
Index: converter/ppm/ppmtopj.c
===================================================================
--- converter/ppm/ppmtopj.c.orig 2015-05-11 16:40:42.638308830 +0200
+++ converter/ppm/ppmtopj.c 2015-05-11 16:44:16.574125934 +0200
--- converter/ppm/ppmtopj.c.orig 2015-12-16 17:11:28.138357445 +0100
+++ converter/ppm/ppmtopj.c 2015-12-17 09:45:59.985670041 +0100
@@ -179,6 +179,7 @@
pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
@ -879,9 +785,9 @@ Index: converter/ppm/ppmtopj.c
Index: converter/ppm/ppmtopjxl.c
===================================================================
--- converter/ppm/ppmtopjxl.c.orig 2015-05-11 16:40:42.857311714 +0200
+++ converter/ppm/ppmtopjxl.c 2015-05-11 16:44:16.574125934 +0200
@@ -305,6 +305,8 @@
--- converter/ppm/ppmtopjxl.c.orig 2015-12-16 17:11:28.366357443 +0100
+++ converter/ppm/ppmtopjxl.c 2015-12-17 09:45:59.985670041 +0100
@@ -266,6 +266,8 @@
pm_error("image too large; reduce with ppmscale");
if (maxval > PCL_MAXVAL)
pm_error("color range too large; reduce with ppmcscale");
@ -890,7 +796,7 @@ Index: converter/ppm/ppmtopjxl.c
/* Figure out the colormap. */
pm_message("Computing colormap...");
@@ -325,6 +327,8 @@
@@ -286,6 +288,8 @@
case 0: /* direct mode (no palette) */
bpp = bitsperpixel(maxval); /* bits per pixel */
bpg = bpp; bpb = bpp;
@ -899,7 +805,7 @@ Index: converter/ppm/ppmtopjxl.c
bpp = (bpp*3+7)>>3; /* bytes per pixel now */
bpr = (bpp<<3)-bpg-bpb;
bpp *= cols; /* bytes per row now */
@@ -334,9 +338,13 @@
@@ -295,9 +299,13 @@
case 3: case 7: pclindex++;
default:
bpp = 8/pclindex;
@ -915,8 +821,8 @@ Index: converter/ppm/ppmtopjxl.c
runcnt = (signed char *)malloc((unsigned)bpp);
Index: converter/ppm/ppmtowinicon.c
===================================================================
--- converter/ppm/ppmtowinicon.c.orig 2015-05-11 16:40:42.854311675 +0200
+++ converter/ppm/ppmtowinicon.c 2015-05-11 16:44:16.575125947 +0200
--- converter/ppm/ppmtowinicon.c.orig 2015-12-16 17:11:28.362357443 +0100
+++ converter/ppm/ppmtowinicon.c 2015-12-17 09:45:59.985670041 +0100
@@ -12,6 +12,7 @@
#include <math.h>
@ -962,8 +868,8 @@ Index: converter/ppm/ppmtowinicon.c
if (verbose)
Index: converter/ppm/ppmtoxpm.c
===================================================================
--- converter/ppm/ppmtoxpm.c.orig 2015-05-11 16:40:42.853311661 +0200
+++ converter/ppm/ppmtoxpm.c 2015-05-11 16:44:16.575125947 +0200
--- converter/ppm/ppmtoxpm.c.orig 2015-12-16 17:11:28.362357443 +0100
+++ converter/ppm/ppmtoxpm.c 2015-12-17 09:45:59.985670041 +0100
@@ -197,6 +197,7 @@
unsigned int i;
@ -982,8 +888,8 @@ Index: converter/ppm/ppmtoxpm.c
pm_error("Out of memory allocating %u bytes for a color map.",
Index: converter/ppm/qrttoppm.c
===================================================================
--- converter/ppm/qrttoppm.c.orig 2015-05-11 16:40:42.019300682 +0200
+++ converter/ppm/qrttoppm.c 2015-05-11 16:44:16.575125947 +0200
--- converter/ppm/qrttoppm.c.orig 2015-12-16 17:11:27.314357455 +0100
+++ converter/ppm/qrttoppm.c 2015-12-17 09:45:59.989670041 +0100
@@ -46,7 +46,7 @@
ppm_writeppminit( stdout, cols, rows, maxval, 0 );
@ -995,8 +901,8 @@ Index: converter/ppm/qrttoppm.c
Index: converter/ppm/sldtoppm.c
===================================================================
--- converter/ppm/sldtoppm.c.orig 2015-05-11 16:40:42.851311635 +0200
+++ converter/ppm/sldtoppm.c 2015-05-11 16:44:16.575125947 +0200
--- converter/ppm/sldtoppm.c.orig 2015-12-16 17:11:28.362357443 +0100
+++ converter/ppm/sldtoppm.c 2015-12-17 09:45:59.989670041 +0100
@@ -464,6 +464,8 @@
/* Allocate image buffer and clear it to black. */
@ -1008,8 +914,8 @@ Index: converter/ppm/sldtoppm.c
ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
Index: converter/ppm/ximtoppm.c
===================================================================
--- converter/ppm/ximtoppm.c.orig 2015-05-11 16:40:42.852311648 +0200
+++ converter/ppm/ximtoppm.c 2015-05-11 16:44:16.575125947 +0200
--- converter/ppm/ximtoppm.c.orig 2015-12-16 17:11:28.362357443 +0100
+++ converter/ppm/ximtoppm.c 2015-12-17 09:45:59.989670041 +0100
@@ -117,6 +117,7 @@
header->bits_channel = atoi(a_head.bits_per_channel);
header->alpha_flag = atoi(a_head.alpha_channel);
@ -1044,8 +950,8 @@ Index: converter/ppm/ximtoppm.c
if (header->colors == NULL) {
Index: editor/pamcut.c
===================================================================
--- editor/pamcut.c.orig 2015-05-11 16:40:38.793258196 +0200
+++ editor/pamcut.c 2015-05-11 16:44:16.576125959 +0200
--- editor/pamcut.c.orig 2015-12-16 17:11:24.810357484 +0100
+++ editor/pamcut.c 2015-12-17 09:45:59.989670041 +0100
@@ -655,6 +655,8 @@
outpam = inpam; /* Initial value -- most fields should be same */
@ -1057,8 +963,8 @@ Index: editor/pamcut.c
Index: editor/pbmreduce.c
===================================================================
--- editor/pbmreduce.c.orig 2015-05-11 16:40:38.795258222 +0200
+++ editor/pbmreduce.c 2015-05-11 16:44:16.576125959 +0200
--- editor/pbmreduce.c.orig 2015-12-16 17:11:24.814357484 +0100
+++ editor/pbmreduce.c 2015-12-17 09:45:59.989670041 +0100
@@ -94,6 +94,7 @@
if (halftone == QT_FS) {
unsigned int col;
@ -1069,8 +975,8 @@ Index: editor/pbmreduce.c
if (thiserr == NULL || nexterr == NULL)
Index: editor/pnmgamma.c
===================================================================
--- editor/pnmgamma.c.orig 2015-05-11 16:40:39.168263134 +0200
+++ editor/pnmgamma.c 2015-05-11 16:44:16.576125959 +0200
--- editor/pnmgamma.c.orig 2015-12-16 17:11:24.974357482 +0100
+++ editor/pnmgamma.c 2015-12-17 09:45:59.989670041 +0100
@@ -596,6 +596,7 @@
xelval ** const btableP) {
@ -1081,8 +987,8 @@ Index: editor/pnmgamma.c
MALLOCARRAY(*btableP, maxval+1);
Index: editor/pnmhisteq.c
===================================================================
--- editor/pnmhisteq.c.orig 2015-05-11 16:40:38.796258235 +0200
+++ editor/pnmhisteq.c 2015-05-11 16:44:16.576125959 +0200
--- editor/pnmhisteq.c.orig 2015-12-16 17:11:24.814357484 +0100
+++ editor/pnmhisteq.c 2015-12-17 09:45:59.989670041 +0100
@@ -107,6 +107,7 @@
unsigned int pixelCount;
unsigned int * lumahist;
@ -1093,8 +999,8 @@ Index: editor/pnmhisteq.c
pm_error("Out of storage allocating array for %u histogram elements",
Index: editor/pnmindex.csh
===================================================================
--- editor/pnmindex.csh.orig 2015-05-11 16:44:16.556125701 +0200
+++ editor/pnmindex.csh 2015-05-11 16:44:16.576125959 +0200
--- editor/pnmindex.csh.orig 2015-12-17 09:45:59.969670041 +0100
+++ editor/pnmindex.csh 2015-12-17 09:45:59.989670041 +0100
@@ -1,5 +1,8 @@
#!/bin/csh -f
#
@ -1106,9 +1012,9 @@ Index: editor/pnmindex.csh
# Copyright (C) 1991 by Jef Poskanzer.
Index: editor/pnmpad.c
===================================================================
--- editor/pnmpad.c.orig 2015-05-11 16:40:39.038261421 +0200
+++ editor/pnmpad.c 2015-05-11 16:44:16.577125970 +0200
@@ -527,6 +527,8 @@
--- editor/pnmpad.c.orig 2015-12-16 17:11:24.846357483 +0100
+++ editor/pnmpad.c 2015-12-17 09:45:59.989670041 +0100
@@ -631,6 +631,8 @@
computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
@ -1119,9 +1025,9 @@ Index: editor/pnmpad.c
if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
Index: editor/pnmremap.c
===================================================================
--- editor/pnmremap.c.orig 2015-05-11 16:40:38.792258182 +0200
+++ editor/pnmremap.c 2015-05-11 16:44:16.577125970 +0200
@@ -427,7 +427,7 @@
--- editor/pnmremap.c.orig 2015-12-16 17:11:24.810357484 +0100
+++ editor/pnmremap.c 2015-12-17 09:45:59.989670041 +0100
@@ -429,7 +429,7 @@
unsigned int plane;
unsigned int const fserrSize = pamP->width + 2;
@ -1130,7 +1036,7 @@ Index: editor/pnmremap.c
fserrP->width = pamP->width;
MALLOCARRAY(fserrP->thiserr, pamP->depth);
@@ -465,6 +465,7 @@
@@ -467,6 +467,7 @@
int col;
@ -1140,8 +1046,8 @@ Index: editor/pnmremap.c
for (plane = 0; plane < pamP->depth; ++plane)
Index: editor/pnmscalefixed.c
===================================================================
--- editor/pnmscalefixed.c.orig 2015-05-11 16:40:39.039261431 +0200
+++ editor/pnmscalefixed.c 2015-05-11 16:44:16.577125970 +0200
--- editor/pnmscalefixed.c.orig 2015-12-16 17:11:24.846357483 +0100
+++ editor/pnmscalefixed.c 2015-12-17 09:45:59.989670041 +0100
@@ -214,6 +214,8 @@
const int rows, const int cols,
int * newrowsP, int * newcolsP) {
@ -1172,8 +1078,8 @@ Index: editor/pnmscalefixed.c
Index: editor/pnmshear.c
===================================================================
--- editor/pnmshear.c.orig 2015-05-11 16:40:38.797258248 +0200
+++ editor/pnmshear.c 2015-05-11 16:44:16.577125970 +0200
--- editor/pnmshear.c.orig 2015-12-16 17:11:24.814357484 +0100
+++ editor/pnmshear.c 2015-12-17 09:45:59.989670041 +0100
@@ -15,6 +15,7 @@
#include <assert.h>
#include <math.h>
@ -1196,8 +1102,8 @@ Index: editor/pnmshear.c
pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
Index: editor/ppmdither.c
===================================================================
--- editor/ppmdither.c.orig 2015-05-11 16:40:38.799258275 +0200
+++ editor/ppmdither.c 2015-05-11 16:44:16.577125970 +0200
--- editor/ppmdither.c.orig 2015-12-16 17:11:24.818357484 +0100
+++ editor/ppmdither.c 2015-12-17 09:45:59.989670041 +0100
@@ -355,7 +355,11 @@
unsigned int const dithMatSize =
(dithDim * sizeof(*dithMat)) + /* pointers */
@ -1213,8 +1119,8 @@ Index: editor/ppmdither.c
if (dithMat == NULL)
Index: editor/specialty/pamoil.c
===================================================================
--- editor/specialty/pamoil.c.orig 2015-05-11 16:40:38.802258314 +0200
+++ editor/specialty/pamoil.c 2015-05-11 16:44:16.578125982 +0200
--- editor/specialty/pamoil.c.orig 2015-12-16 17:11:24.818357484 +0100
+++ editor/specialty/pamoil.c 2015-12-17 09:45:59.989670041 +0100
@@ -112,6 +112,7 @@
tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
pm_close(ifp);
@ -1225,8 +1131,8 @@ Index: editor/specialty/pamoil.c
pm_error("Unable to allocate memory for histogram.");
Index: generator/pbmtext.c
===================================================================
--- generator/pbmtext.c.orig 2015-05-11 16:40:39.320265135 +0200
+++ generator/pbmtext.c 2015-05-11 16:44:16.578125982 +0200
--- generator/pbmtext.c.orig 2015-12-16 17:11:25.098357480 +0100
+++ generator/pbmtext.c 2015-12-17 09:45:59.989670041 +0100
@@ -96,12 +96,14 @@
for (i = 1; i < argc; ++i) {
@ -1260,8 +1166,8 @@ Index: generator/pbmtext.c
}
Index: generator/pgmkernel.c
===================================================================
--- generator/pgmkernel.c.orig 2015-05-11 16:40:39.320265135 +0200
+++ generator/pgmkernel.c 2015-05-11 16:44:16.578125982 +0200
--- generator/pgmkernel.c.orig 2015-12-16 17:11:25.098357480 +0100
+++ generator/pgmkernel.c 2015-12-17 09:45:59.989670041 +0100
@@ -214,6 +214,7 @@
/* Output matrix is symmetric vertically and horizontally. */
@ -1272,8 +1178,8 @@ Index: generator/pgmkernel.c
halfKernel = pgm_allocarray(cmdline.cols, arows);
Index: lib/libpam.c
===================================================================
--- lib/libpam.c.orig 2015-05-11 16:40:40.122275695 +0200
+++ lib/libpam.c 2015-05-11 16:44:16.578125982 +0200
--- lib/libpam.c.orig 2015-12-16 17:11:25.606357475 +0100
+++ lib/libpam.c 2015-12-17 09:45:59.989670041 +0100
@@ -224,7 +224,8 @@
unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
tuple * tuplerow;
@ -1286,8 +1192,8 @@ Index: lib/libpam.c
/* Now we initialize the pointers to the individual tuples
Index: lib/libpammap.c
===================================================================
--- lib/libpammap.c.orig 2015-05-11 16:40:40.122275695 +0200
+++ lib/libpammap.c 2015-05-11 16:44:16.579125996 +0200
--- lib/libpammap.c.orig 2015-12-16 17:11:25.606357475 +0100
+++ lib/libpammap.c 2015-12-17 09:45:59.989670041 +0100
@@ -108,6 +108,8 @@
*/
struct tupleint_list_item * retval;
@ -1299,8 +1205,8 @@ Index: lib/libpammap.c
+ pamP->depth * sizeof(sample);
Index: lib/libpbm1.c
===================================================================
--- lib/libpbm1.c.orig 2015-05-11 16:40:40.129275789 +0200
+++ lib/libpbm1.c 2015-05-11 16:44:16.579125996 +0200
--- lib/libpbm1.c.orig 2015-12-16 17:11:25.606357475 +0100
+++ lib/libpbm1.c 2015-12-17 09:45:59.989670041 +0100
@@ -79,6 +79,7 @@
} else {
pm_filepos const bytesPerRow = (cols+7)/8;
@ -1311,8 +1217,8 @@ Index: lib/libpbm1.c
}
Index: lib/libpm.c
===================================================================
--- lib/libpm.c.orig 2015-05-11 16:44:16.549125612 +0200
+++ lib/libpm.c 2015-05-11 16:44:16.579125996 +0200
--- lib/libpm.c.orig 2015-12-17 09:45:59.961670041 +0100
+++ lib/libpm.c 2015-12-17 09:45:59.989670041 +0100
@@ -844,4 +844,53 @@
}
@ -1369,8 +1275,8 @@ Index: lib/libpm.c
Index: lib/pm.h
===================================================================
--- lib/pm.h.orig 2015-05-11 16:40:40.127275764 +0200
+++ lib/pm.h 2015-05-11 16:44:16.579125996 +0200
--- lib/pm.h.orig 2015-12-16 17:11:25.606357475 +0100
+++ lib/pm.h 2015-12-17 09:45:59.993670041 +0100
@@ -435,4 +435,11 @@
#endif
@ -1385,8 +1291,8 @@ Index: lib/pm.h
#endif
Index: other/pnmcolormap.c
===================================================================
--- other/pnmcolormap.c.orig 2015-05-11 16:40:37.942246988 +0200
+++ other/pnmcolormap.c 2015-05-11 16:44:16.579125996 +0200
--- other/pnmcolormap.c.orig 2015-12-16 17:11:24.354357489 +0100
+++ other/pnmcolormap.c 2015-12-17 09:45:59.993670041 +0100
@@ -840,6 +840,7 @@
pamP->width = intsqrt;
else
@ -1397,8 +1303,8 @@ Index: other/pnmcolormap.c
unsigned int const intQuotient = colormap.size / pamP->width;
Index: urt/README
===================================================================
--- urt/README.orig 2015-05-11 16:40:43.184316020 +0200
+++ urt/README 2015-05-11 16:44:16.580126011 +0200
--- urt/README.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/README 2015-12-17 09:45:59.993670041 +0100
@@ -18,3 +18,8 @@
defines stdout as a variable, so that wouldn't compile. So I changed
it to NULL and added a line to rle_hdr_init to set that field to
@ -1410,8 +1316,8 @@ Index: urt/README
+Alan Cox <alan@redhat.com>
Index: urt/rle_addhist.c
===================================================================
--- urt/rle_addhist.c.orig 2015-05-11 16:40:43.185316034 +0200
+++ urt/rle_addhist.c 2015-05-11 16:44:16.580126011 +0200
--- urt/rle_addhist.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/rle_addhist.c 2015-12-17 09:45:59.993670041 +0100
@@ -14,6 +14,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -1458,8 +1364,8 @@ Index: urt/rle_addhist.c
MALLOCARRAY(newc, length);
Index: urt/rle_getrow.c
===================================================================
--- urt/rle_getrow.c.orig 2015-05-11 16:40:43.184316020 +0200
+++ urt/rle_getrow.c 2015-05-11 16:44:16.580126011 +0200
--- urt/rle_getrow.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/rle_getrow.c 2015-12-17 09:58:10.725661623 +0100
@@ -17,6 +17,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -1469,18 +1375,18 @@ Index: urt/rle_getrow.c
*/
/*
* rle_getrow.c - Read an RLE file in.
@@ -168,6 +170,7 @@
register char * cp;
@@ -160,6 +162,7 @@
char * cp;
VAXSHORT(comlen, infile); /* get comment length */
+ overflow_add(comlen, 1);
evenlen = (comlen + 1) & ~1; /* make it even */
if ( evenlen )
{
if (evenlen) {
MALLOCARRAY(comment_buf, evenlen);
Index: urt/rle_hdr.c
===================================================================
--- urt/rle_hdr.c.orig 2015-05-11 16:40:43.185316034 +0200
+++ urt/rle_hdr.c 2015-05-11 16:44:16.580126011 +0200
--- urt/rle_hdr.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/rle_hdr.c 2015-12-17 09:45:59.993670041 +0100
@@ -14,6 +14,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -1549,8 +1455,8 @@ Index: urt/rle_hdr.c
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
Index: urt/rle.h
===================================================================
--- urt/rle.h.orig 2015-05-11 16:40:43.186316047 +0200
+++ urt/rle.h 2015-05-11 16:44:16.580126011 +0200
--- urt/rle.h.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/rle.h 2015-12-17 09:45:59.993670041 +0100
@@ -14,6 +14,9 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -1581,8 +1487,8 @@ Index: urt/rle.h
Index: urt/rle_open_f.c
===================================================================
--- urt/rle_open_f.c.orig 2015-05-11 16:40:43.184316020 +0200
+++ urt/rle_open_f.c 2015-05-11 16:44:16.581126025 +0200
--- urt/rle_open_f.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/rle_open_f.c 2015-12-17 09:45:59.993670041 +0100
@@ -163,65 +163,7 @@
FILE ** const fpP,
bool * const noSubprocessP,
@ -1651,8 +1557,8 @@ Index: urt/rle_open_f.c
Index: urt/rle_putcom.c
===================================================================
--- urt/rle_putcom.c.orig 2015-05-11 16:40:43.184316020 +0200
+++ urt/rle_putcom.c 2015-05-11 16:44:16.581126025 +0200
--- urt/rle_putcom.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/rle_putcom.c 2015-12-17 09:45:59.993670041 +0100
@@ -14,6 +14,8 @@
* If you modify this software, you should include a notice giving the
* name of the person performing the modification, the date of modification,
@ -1680,8 +1586,8 @@ Index: urt/rle_putcom.c
* comments block. Of course, if this were true, then the
Index: urt/Runput.c
===================================================================
--- urt/Runput.c.orig 2015-05-11 16:40:43.186316047 +0200
+++ urt/Runput.c 2015-05-11 16:44:16.581126025 +0200
--- urt/Runput.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/Runput.c 2015-12-17 09:45:59.993670041 +0100
@@ -17,6 +17,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -1716,8 +1622,8 @@ Index: urt/Runput.c
fprintf( stderr,
Index: urt/scanargs.c
===================================================================
--- urt/scanargs.c.orig 2015-05-11 16:40:43.182315993 +0200
+++ urt/scanargs.c 2015-05-11 16:44:16.581126025 +0200
--- urt/scanargs.c.orig 2015-12-16 17:11:28.646357439 +0100
+++ urt/scanargs.c 2015-12-17 09:45:59.993670041 +0100
@@ -38,6 +38,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire

10
netpbm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Dec 17 11:29:19 UTC 2015 - pgajdos@suse.com
- updated to 10.72.4
* see HISTORY for upstrem changelog
* added useful returns
+ netpbm-gcc-warnings.patch
* forwardported
. netpbm-security-code.patch
-------------------------------------------------------------------
Tue Jun 23 14:00:50 UTC 2015 - mvyskocil@opensuse.org

6
netpbm.spec
View File

@ -17,11 +17,11 @@
%define libmaj 11
%define libmin 70
%define libmin 72
%define libver %{libmaj}.%{libmin}
Name: netpbm
Version: 10.70.4
Version: 10.72.4
Release: 0
Summary: A Powerful Graphics Conversion Package
License: BSD-3-Clause and GPL-2.0+ and IJG and MIT and SUSE-Public-Domain
@ -40,6 +40,7 @@ Patch2: %{name}-missing-file-close.patch
Patch3: %{name}-tmpfile.patch
Patch4: %{name}-security-code.patch
Patch5: %{name}-security-scripts.patch
Patch6: %{name}-gcc-warnings.patch
BuildRequires: flex
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
@ -112,6 +113,7 @@ source package.
%patch3
%patch4
%patch5
%patch6
mkdir pnmtopalm # for %%doc pnmtopalm
cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm