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

- updated to 10.68.1

Browse Source 
* pnmconvol: add -bias .
  * Remove pnmcomp, install a pnmcomp symlink for pamcomp.
  * Fix incorrect option parsing when there are multiple common
    options (e.g. -plain -quiet).
  * cameratopam: fix buffer overflow.
  * cameratopam: fix incorrect output.
  * ppmtopict: Fix unconditional crash.

OBS-URL: https://build.opensuse.org/package/show/graphics/netpbm?expand=0&rev=64
This commit is contained in:
Petr Gajdos 2014-11-19 09:19:38 +00:00 committed by Git OBS Bridge
parent a5888035ac
commit 0aceed133e
7 changed files with 188 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

349
netpbm-security-code.patch
View File

@ -1,7 +1,7 @@
Index: analyzer/pgmtexture.c
===================================================================
--- analyzer/pgmtexture.c.orig 2014-09-08 09:55:59.812026874 +0200
+++ analyzer/pgmtexture.c 2014-09-08 10:01:32.600021171 +0200
--- analyzer/pgmtexture.c.orig 2014-11-18 17:13:03.448739493 +0100
+++ analyzer/pgmtexture.c 2014-11-19 10:04:24.731745451 +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 2014-09-08 09:56:02.576026827 +0200
+++ converter/other/gemtopnm.c 2014-09-08 10:01:32.600021171 +0200
--- converter/other/gemtopnm.c.orig 2014-11-18 17:13:06.186775942 +0100
+++ converter/other/gemtopnm.c 2014-11-19 10:04:24.731745451 +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 2014-09-08 09:56:01.740026841 +0200
+++ converter/other/jpegtopnm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/jpegtopnm.c.orig 2014-11-18 17:13:05.263763657 +0100
+++ converter/other/jpegtopnm.c 2014-11-19 10:04:24.731745451 +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 2014-09-08 09:56:02.576026827 +0200
+++ converter/other/pbmtopgm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/pbmtopgm.c.orig 2014-11-18 17:13:06.186775942 +0100
+++ converter/other/pbmtopgm.c 2014-11-19 10:04:24.731745451 +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 2014-09-08 09:56:02.624026826 +0200
+++ converter/other/pnmtoddif.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/pnmtoddif.c.orig 2014-11-18 17:13:06.243776701 +0100
+++ converter/other/pnmtoddif.c 2014-11-19 10:04:24.732745464 +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 2014-09-08 09:56:01.156026851 +0200
+++ converter/other/pnmtojpeg.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/pnmtojpeg.c.orig 2014-11-18 17:13:04.832757922 +0100
+++ converter/other/pnmtojpeg.c 2014-11-19 10:04:24.732745464 +0100
@@ -605,7 +605,11 @@
want JPOOL_PERMANENT.
*/
@ -121,8 +121,8 @@ 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 2014-09-08 09:56:01.740026841 +0200
+++ converter/other/pnmtops.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/pnmtops.c.orig 2014-11-18 17:13:05.262763644 +0100
+++ converter/other/pnmtops.c 2014-11-19 10:04:24.732745464 +0100
@@ -292,17 +292,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 2014-09-08 09:56:02.572026827 +0200
+++ converter/other/pnmtorle.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/pnmtorle.c.orig 2014-11-18 17:13:06.182775889 +0100
+++ converter/other/pnmtorle.c 2014-11-19 10:04:24.733745478 +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,8 +161,8 @@ 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 2014-09-08 10:01:32.604021171 +0200
+++ converter/other/pnmtosgi.c 2014-09-08 10:06:54.540015654 +0200
--- converter/other/pnmtosgi.c.orig 2014-11-18 17:13:06.188775969 +0100
+++ converter/other/pnmtosgi.c 2014-11-19 10:04:24.733745478 +0100
@@ -180,6 +180,9 @@
/* writes result into rletemp */
unsigned int i;
@ -183,8 +183,8 @@ Index: converter/other/pnmtosgi.c
} else
Index: converter/other/rletopnm.c
===================================================================
--- converter/other/rletopnm.c.orig 2014-09-08 09:56:02.572026827 +0200
+++ converter/other/rletopnm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/rletopnm.c.orig 2014-11-18 17:13:06.182775889 +0100
+++ converter/other/rletopnm.c 2014-11-19 10:04:24.733745478 +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,8 +196,8 @@ 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 2014-09-08 10:01:32.604021171 +0200
+++ converter/other/sgitopnm.c 2014-09-08 10:09:43.276012762 +0200
--- converter/other/sgitopnm.c.orig 2014-11-18 17:13:06.189775982 +0100
+++ converter/other/sgitopnm.c 2014-11-19 10:04:24.733745478 +0100
@@ -372,10 +372,14 @@
MALLOCARRAY_NOFAIL(image, head->ysize);
} else {
@ -216,8 +216,8 @@ Index: converter/other/sgitopnm.c
unsigned int row;
Index: converter/other/sirtopnm.c
===================================================================
--- converter/other/sirtopnm.c.orig 2014-09-08 09:56:02.576026827 +0200
+++ converter/other/sirtopnm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/sirtopnm.c.orig 2014-11-18 17:13:06.184775916 +0100
+++ converter/other/sirtopnm.c 2014-11-19 10:04:24.733745478 +0100
@@ -69,6 +69,7 @@
}
break;
@ -228,9 +228,9 @@ Index: converter/other/sirtopnm.c
if ( !( sirarray = (unsigned char*) malloc( picsize ) ) )
Index: converter/other/tifftopnm.c
===================================================================
--- converter/other/tifftopnm.c.orig 2014-09-08 09:56:02.580026827 +0200
+++ converter/other/tifftopnm.c 2014-09-08 10:01:32.604021171 +0200
@@ -1279,7 +1279,9 @@
--- converter/other/tifftopnm.c.orig 2014-11-18 17:13:06.189775982 +0100
+++ converter/other/tifftopnm.c 2014-11-19 10:04:24.734745491 +0100
@@ -1284,7 +1284,9 @@
if (scanbuf == NULL)
pm_error("can't allocate memory for scanline buffer");
@ -243,8 +243,8 @@ Index: converter/other/tifftopnm.c
Index: converter/other/xwdtopnm.c
===================================================================
--- converter/other/xwdtopnm.c.orig 2014-09-08 09:56:01.884026838 +0200
+++ converter/other/xwdtopnm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/other/xwdtopnm.c.orig 2014-11-18 17:13:05.383765258 +0100
+++ converter/other/xwdtopnm.c 2014-11-19 10:04:24.734745491 +0100
@@ -209,6 +209,10 @@
*colorsP = pnm_allocrow(2);
PNM_ASSIGN1((*colorsP)[0], 0);
@ -266,8 +266,8 @@ Index: converter/other/xwdtopnm.c
h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
Index: converter/pbm/mdatopbm.c
===================================================================
--- converter/pbm/mdatopbm.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/mdatopbm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/mdatopbm.c.orig 2014-11-18 17:13:07.535793895 +0100
+++ converter/pbm/mdatopbm.c 2014-11-19 10:04:24.734745491 +0100
@@ -245,10 +245,13 @@
pm_readlittleshort(infile, &yy); nInCols = yy;
}
@ -285,8 +285,8 @@ Index: converter/pbm/mdatopbm.c
Index: converter/pbm/mgrtopbm.c
===================================================================
--- converter/pbm/mgrtopbm.c.orig 2014-09-08 09:56:03.896026804 +0200
+++ converter/pbm/mgrtopbm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/mgrtopbm.c.orig 2014-11-18 17:13:07.641795305 +0100
+++ converter/pbm/mgrtopbm.c 2014-11-19 10:04:24.734745491 +0100
@@ -65,6 +65,8 @@
if (head.h_high < ' ' || head.l_high < ' ')
pm_error("Invalid width field in MGR header");
@ -298,8 +298,8 @@ Index: converter/pbm/mgrtopbm.c
*padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
Index: converter/pbm/pbmtogem.c
===================================================================
--- converter/pbm/pbmtogem.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/pbmtogem.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtogem.c.orig 2014-11-18 17:13:07.536793909 +0100
+++ converter/pbm/pbmtogem.c 2014-11-19 10:04:24.735745505 +0100
@@ -79,6 +79,7 @@
bitsperitem = 0;
bitshift = 7;
@ -310,8 +310,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 2014-09-08 09:56:03.892026804 +0200
+++ converter/pbm/pbmtogo.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtogo.c.orig 2014-11-18 17:13:07.638795267 +0100
+++ converter/pbm/pbmtogo.c 2014-11-19 10:04:24.735745505 +0100
@@ -158,6 +158,7 @@
bitrow = pbm_allocrow(cols);
@ -322,8 +322,8 @@ Index: converter/pbm/pbmtogo.c
rucols = rucols * 8;
Index: converter/pbm/pbmtolj.c
===================================================================
--- converter/pbm/pbmtolj.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/pbmtolj.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtolj.c.orig 2014-11-18 17:13:07.535793895 +0100
+++ converter/pbm/pbmtolj.c 2014-11-19 10:04:24.735745505 +0100
@@ -120,7 +120,11 @@
static void
allocateBuffers(unsigned int const cols) {
@ -338,8 +338,8 @@ Index: converter/pbm/pbmtolj.c
Index: converter/pbm/pbmtomacp.c
===================================================================
--- converter/pbm/pbmtomacp.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/pbmtomacp.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtomacp.c.orig 2014-11-18 17:13:07.539793949 +0100
+++ converter/pbm/pbmtomacp.c 2014-11-19 10:04:24.735745505 +0100
@@ -101,6 +101,7 @@
if( !lflg )
left = 0;
@ -359,8 +359,8 @@ Index: converter/pbm/pbmtomacp.c
bottom = top + MAX_LINES - 1;
Index: converter/pbm/pbmtomda.c
===================================================================
--- converter/pbm/pbmtomda.c.orig 2014-09-08 09:56:03.892026804 +0200
+++ converter/pbm/pbmtomda.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtomda.c.orig 2014-11-18 17:13:07.637795254 +0100
+++ converter/pbm/pbmtomda.c 2014-11-19 10:04:24.735745505 +0100
@@ -179,6 +179,7 @@
nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
@ -371,8 +371,8 @@ Index: converter/pbm/pbmtomda.c
nOutCols = nInCols / 8;
Index: converter/pbm/pbmtoppa/pbm.c
===================================================================
--- converter/pbm/pbmtoppa/pbm.c.orig 2014-09-08 09:56:03.776026806 +0200
+++ converter/pbm/pbmtoppa/pbm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtoppa/pbm.c.orig 2014-11-18 17:13:07.543794001 +0100
+++ converter/pbm/pbmtoppa/pbm.c 2014-11-19 10:04:24.735745505 +0100
@@ -105,6 +105,7 @@
return 0;
@ -393,8 +393,8 @@ Index: converter/pbm/pbmtoppa/pbm.c
}
Index: converter/pbm/pbmtoppa/pbmtoppa.c
===================================================================
--- converter/pbm/pbmtoppa/pbmtoppa.c.orig 2014-09-08 09:56:03.776026806 +0200
+++ converter/pbm/pbmtoppa/pbmtoppa.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtoppa/pbmtoppa.c.orig 2014-11-18 17:13:07.543794001 +0100
+++ converter/pbm/pbmtoppa/pbmtoppa.c 2014-11-19 10:04:24.736745518 +0100
@@ -441,6 +441,7 @@
pm_error("main(): unrecognized parameter '%s'", argv[argn]);
}
@ -405,8 +405,8 @@ Index: converter/pbm/pbmtoppa/pbmtoppa.c
Index: converter/pbm/pbmtoxbm.c
===================================================================
--- converter/pbm/pbmtoxbm.c.orig 2014-09-08 09:56:03.896026804 +0200
+++ converter/pbm/pbmtoxbm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtoxbm.c.orig 2014-11-18 17:13:07.641795305 +0100
+++ converter/pbm/pbmtoxbm.c 2014-11-19 10:04:24.736745518 +0100
@@ -335,6 +335,8 @@
unsigned char * bitrow;
@ -418,8 +418,8 @@ Index: converter/pbm/pbmtoxbm.c
Index: converter/pbm/pbmtoybm.c
===================================================================
--- converter/pbm/pbmtoybm.c.orig 2014-09-08 09:56:03.896026804 +0200
+++ converter/pbm/pbmtoybm.c 2014-09-08 10:01:32.604021171 +0200
--- converter/pbm/pbmtoybm.c.orig 2014-11-18 17:13:07.641795305 +0100
+++ converter/pbm/pbmtoybm.c 2014-11-19 10:04:24.736745518 +0100
@@ -113,6 +113,7 @@
bitrow = pbm_allocrow(cols);
@ -430,8 +430,8 @@ Index: converter/pbm/pbmtoybm.c
putinit(cols, rows);
Index: converter/pbm/pbmtozinc.c
===================================================================
--- converter/pbm/pbmtozinc.c.orig 2014-09-08 09:56:03.892026804 +0200
+++ converter/pbm/pbmtozinc.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pbm/pbmtozinc.c.orig 2014-11-18 17:13:07.638795267 +0100
+++ converter/pbm/pbmtozinc.c 2014-11-19 10:04:24.736745518 +0100
@@ -65,6 +65,7 @@
bitrow = pbm_allocrow( cols );
@ -442,8 +442,8 @@ Index: converter/pbm/pbmtozinc.c
printf( "USHORT %s[] = {\n",name);
Index: converter/pbm/pbmto10x.c
===================================================================
--- converter/pbm/pbmto10x.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/pbmto10x.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pbm/pbmto10x.c.orig 2014-11-18 17:13:07.536793909 +0100
+++ converter/pbm/pbmto10x.c 2014-11-19 10:04:24.736745518 +0100
@@ -162,7 +162,7 @@
res_60x72();
@ -455,8 +455,8 @@ Index: converter/pbm/pbmto10x.c
Index: converter/pbm/pbmto4425.c
===================================================================
--- converter/pbm/pbmto4425.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/pbmto4425.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pbm/pbmto4425.c.orig 2014-11-18 17:13:07.534793882 +0100
+++ converter/pbm/pbmto4425.c 2014-11-19 10:04:24.736745518 +0100
@@ -2,6 +2,7 @@
#include "nstring.h"
@ -476,8 +476,8 @@ Index: converter/pbm/pbmto4425.c
pm_error( "Cannot allocate memory" );
Index: converter/pbm/pktopbm.c
===================================================================
--- converter/pbm/pktopbm.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/pktopbm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pbm/pktopbm.c.orig 2014-11-18 17:13:07.537793922 +0100
+++ converter/pbm/pktopbm.c 2014-11-19 10:04:24.736745518 +0100
@@ -277,6 +277,7 @@
if (flagbyte == 7) { /* long form preamble */
integer packetlength = get32() ; /* character packet length */
@ -488,8 +488,8 @@ Index: converter/pbm/pktopbm.c
if ((car >= MAXPKCHAR) || !filename[car]) {
Index: converter/pbm/thinkjettopbm.l
===================================================================
--- converter/pbm/thinkjettopbm.l.orig 2014-09-08 09:56:03.896026804 +0200
+++ converter/pbm/thinkjettopbm.l 2014-09-08 10:01:32.608021171 +0200
--- converter/pbm/thinkjettopbm.l.orig 2014-11-18 17:13:07.642795319 +0100
+++ converter/pbm/thinkjettopbm.l 2014-11-19 10:04:24.737745532 +0100
@@ -114,7 +114,9 @@
<RASTERMODE>\033\*b{DIG}+W {
int l;
@ -511,8 +511,8 @@ Index: converter/pbm/thinkjettopbm.l
packed_bitrow = malloc(maxRowLength);
Index: converter/pbm/ybmtopbm.c
===================================================================
--- converter/pbm/ybmtopbm.c.orig 2014-09-08 09:56:03.772026806 +0200
+++ converter/pbm/ybmtopbm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pbm/ybmtopbm.c.orig 2014-11-18 17:13:07.540793962 +0100
+++ converter/pbm/ybmtopbm.c 2014-11-19 10:04:24.737745532 +0100
@@ -49,6 +49,7 @@
pm_error("EOF / read error");
@ -523,8 +523,8 @@ Index: converter/pbm/ybmtopbm.c
Index: converter/pgm/lispmtopgm.c
===================================================================
--- converter/pgm/lispmtopgm.c.orig 2014-09-08 09:56:02.732026824 +0200
+++ converter/pgm/lispmtopgm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pgm/lispmtopgm.c.orig 2014-11-18 17:13:06.368778364 +0100
+++ converter/pgm/lispmtopgm.c 2014-11-19 10:04:24.737745532 +0100
@@ -58,6 +58,7 @@
pm_error( "depth (%d bits) is too large", depth);
@ -546,8 +546,8 @@ Index: converter/pgm/lispmtopgm.c
if ( *colsP != (cols_32 - *padrightP) ) {
Index: converter/pgm/psidtopgm.c
===================================================================
--- converter/pgm/psidtopgm.c.orig 2014-09-08 09:56:02.728026824 +0200
+++ converter/pgm/psidtopgm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/pgm/psidtopgm.c.orig 2014-11-18 17:13:06.367778351 +0100
+++ converter/pgm/psidtopgm.c 2014-11-19 10:04:24.737745532 +0100
@@ -78,6 +78,7 @@
pm_error("bits/sample (%d) is too large.", bitspersample);
@ -558,8 +558,8 @@ Index: converter/pgm/psidtopgm.c
unsigned int col;
Index: converter/ppm/ilbmtoppm.c
===================================================================
--- converter/ppm/ilbmtoppm.c.orig 2014-09-08 09:56:03.612026809 +0200
+++ converter/ppm/ilbmtoppm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ilbmtoppm.c.orig 2014-11-18 17:13:07.413792271 +0100
+++ converter/ppm/ilbmtoppm.c 2014-11-19 10:04:24.738745545 +0100
@@ -592,6 +592,7 @@
rawtype *chp;
@ -632,8 +632,8 @@ Index: converter/ppm/ilbmtoppm.c
Index: converter/ppm/imgtoppm.c
===================================================================
--- converter/ppm/imgtoppm.c.orig 2014-09-08 09:56:03.464026811 +0200
+++ converter/ppm/imgtoppm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/imgtoppm.c.orig 2014-11-18 17:13:07.267790329 +0100
+++ converter/ppm/imgtoppm.c 2014-11-19 10:04:24.738745545 +0100
@@ -84,6 +84,7 @@
len = atoi((char*) buf );
if ( fread( buf, len, 1, ifp ) != 1 )
@ -652,8 +652,8 @@ Index: converter/ppm/imgtoppm.c
"pixel data length (%d) does not match image size (%d)",
Index: converter/ppm/Makefile
===================================================================
--- converter/ppm/Makefile.orig 2014-09-08 09:56:03.464026811 +0200
+++ converter/ppm/Makefile 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/Makefile.orig 2014-11-18 17:13:07.268790342 +0100
+++ converter/ppm/Makefile 2014-11-19 10:04:24.738745545 +0100
@@ -11,7 +11,7 @@
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
@ -665,8 +665,8 @@ Index: converter/ppm/Makefile
ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
Index: converter/ppm/pcxtoppm.c
===================================================================
--- converter/ppm/pcxtoppm.c.orig 2014-09-08 09:56:03.612026809 +0200
+++ converter/ppm/pcxtoppm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/pcxtoppm.c.orig 2014-11-18 17:13:07.413792271 +0100
+++ converter/ppm/pcxtoppm.c 2014-11-19 10:04:24.738745545 +0100
@@ -409,6 +409,7 @@
/*
* clear the pixel buffer
@ -685,8 +685,8 @@ Index: converter/ppm/pcxtoppm.c
pm_message("warning - BytesPerLine = %d, "
Index: converter/ppm/picttoppm.c
===================================================================
--- converter/ppm/picttoppm.c.orig 2014-09-08 09:56:03.612026809 +0200
+++ converter/ppm/picttoppm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/picttoppm.c.orig 2014-11-18 17:13:07.414792285 +0100
+++ converter/ppm/picttoppm.c 2014-11-19 10:04:24.739745558 +0100
@@ -1,3 +1,5 @@
+#error "Unfixable. Don't ship me"
+
@ -695,8 +695,8 @@ Index: converter/ppm/picttoppm.c
*
Index: converter/ppm/pjtoppm.c
===================================================================
--- converter/ppm/pjtoppm.c.orig 2014-09-08 09:56:03.608026809 +0200
+++ converter/ppm/pjtoppm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/pjtoppm.c.orig 2014-11-18 17:13:07.406792178 +0100
+++ converter/ppm/pjtoppm.c 2014-11-19 10:04:24.739745558 +0100
@@ -127,19 +127,21 @@
case 'V': /* send plane */
case 'W': /* send last plane */
@ -748,8 +748,8 @@ Index: converter/ppm/pjtoppm.c
Index: converter/ppm/ppmtoeyuv.c
===================================================================
--- converter/ppm/ppmtoeyuv.c.orig 2014-09-08 09:56:02.852026822 +0200
+++ converter/ppm/ppmtoeyuv.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ppmtoeyuv.c.orig 2014-11-18 17:13:06.501780135 +0100
+++ converter/ppm/ppmtoeyuv.c 2014-11-19 10:04:24.739745558 +0100
@@ -114,6 +114,7 @@
int index;
@ -760,8 +760,8 @@ Index: converter/ppm/ppmtoeyuv.c
MALLOCARRAY_NOFAIL(mult114 , maxval+1);
Index: converter/ppm/ppmtoicr.c
===================================================================
--- converter/ppm/ppmtoicr.c.orig 2014-09-08 09:56:03.464026811 +0200
+++ converter/ppm/ppmtoicr.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ppmtoicr.c.orig 2014-11-18 17:13:07.268790342 +0100
+++ converter/ppm/ppmtoicr.c 2014-11-19 10:04:24.739745558 +0100
@@ -169,7 +169,7 @@
if (rleflag) {
@ -773,8 +773,8 @@ Index: converter/ppm/ppmtoicr.c
for (j=0; j<cols; j++)
Index: converter/ppm/ppmtoilbm.c
===================================================================
--- converter/ppm/ppmtoilbm.c.orig 2014-09-08 09:56:02.852026822 +0200
+++ converter/ppm/ppmtoilbm.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ppmtoilbm.c.orig 2014-11-18 17:13:06.501780135 +0100
+++ converter/ppm/ppmtoilbm.c 2014-11-19 10:04:24.740745572 +0100
@@ -185,6 +185,7 @@
unsigned int i;
int * table;
@ -814,8 +814,8 @@ Index: converter/ppm/ppmtoilbm.c
switch (mode) {
Index: converter/ppm/ppmtolj.c
===================================================================
--- converter/ppm/ppmtolj.c.orig 2014-09-08 09:56:02.852026822 +0200
+++ converter/ppm/ppmtolj.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ppmtolj.c.orig 2014-11-18 17:13:06.503780163 +0100
+++ converter/ppm/ppmtolj.c 2014-11-19 10:04:24.740745572 +0100
@@ -181,7 +181,8 @@
ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
@ -828,8 +828,8 @@ Index: converter/ppm/ppmtolj.c
if (mode == C_TRANS_MODE_DELTA)
Index: converter/ppm/ppmtomitsu.c
===================================================================
--- converter/ppm/ppmtomitsu.c.orig 2014-09-08 09:56:03.608026809 +0200
+++ converter/ppm/ppmtomitsu.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ppmtomitsu.c.orig 2014-11-18 17:13:07.405792165 +0100
+++ converter/ppm/ppmtomitsu.c 2014-11-19 10:04:24.740745572 +0100
@@ -685,6 +685,8 @@
medias = MSize_User;
@ -841,8 +841,8 @@ Index: converter/ppm/ppmtomitsu.c
}
Index: converter/ppm/ppmtopcx.c
===================================================================
--- converter/ppm/ppmtopcx.c.orig 2014-09-08 09:56:03.464026811 +0200
+++ converter/ppm/ppmtopcx.c 2014-09-08 10:01:32.608021171 +0200
--- converter/ppm/ppmtopcx.c.orig 2014-11-18 17:13:07.269790355 +0100
+++ converter/ppm/ppmtopcx.c 2014-11-19 10:04:24.740745572 +0100
@@ -419,6 +419,8 @@
else Planes = 1;
}
@ -854,21 +854,21 @@ Index: converter/ppm/ppmtopcx.c
MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
Index: converter/ppm/ppmtopict.c
===================================================================
--- converter/ppm/ppmtopict.c.orig 2014-09-08 09:56:02.852026822 +0200
+++ converter/ppm/ppmtopict.c 2014-09-08 10:01:32.608021171 +0200
@@ -441,6 +441,8 @@
--- converter/ppm/ppmtopict.c.orig 2014-11-19 10:04:24.741745585 +0100
+++ converter/ppm/ppmtopict.c 2014-11-19 10:06:15.064225019 +0100
@@ -450,6 +450,8 @@
putShort(stdout, 0); /* mode */
/* Finally, write out the data. */
+ overflow_add(cols/MAX_COUNT, 1);
+ overflow_add(cols, cols/MAX_COUNT+1);
packed = malloc((unsigned)(cols+cols/MAX_COUNT+1));
for (row = 0, oc = 0; row < rows; row++)
oc += putRow(stdout, row, cols, pixels[row], packed);
outBuf = malloc((unsigned)(cols+cols/MAX_COUNT+1));
for (row = 0, oc = 0; row < rows; ++row) {
unsigned int rowSize;
Index: converter/ppm/ppmtopj.c
===================================================================
--- converter/ppm/ppmtopj.c.orig 2014-09-08 09:56:03.464026811 +0200
+++ converter/ppm/ppmtopj.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/ppmtopj.c.orig 2014-11-18 17:13:07.267790329 +0100
+++ converter/ppm/ppmtopj.c 2014-11-19 10:04:24.741745585 +0100
@@ -179,6 +179,7 @@
pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
@ -879,8 +879,8 @@ Index: converter/ppm/ppmtopj.c
Index: converter/ppm/ppmtopjxl.c
===================================================================
--- converter/ppm/ppmtopjxl.c.orig 2014-09-08 09:56:03.612026809 +0200
+++ converter/ppm/ppmtopjxl.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/ppmtopjxl.c.orig 2014-11-18 17:13:07.415792298 +0100
+++ converter/ppm/ppmtopjxl.c 2014-11-19 10:04:24.741745585 +0100
@@ -305,6 +305,8 @@
pm_error("image too large; reduce with ppmscale");
if (maxval > PCL_MAXVAL)
@ -915,8 +915,8 @@ Index: converter/ppm/ppmtopjxl.c
runcnt = (signed char *)malloc((unsigned)bpp);
Index: converter/ppm/ppmtowinicon.c
===================================================================
--- converter/ppm/ppmtowinicon.c.orig 2014-09-08 09:56:03.612026809 +0200
+++ converter/ppm/ppmtowinicon.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/ppmtowinicon.c.orig 2014-11-18 17:13:07.411792245 +0100
+++ converter/ppm/ppmtowinicon.c 2014-11-19 10:04:24.741745585 +0100
@@ -12,6 +12,7 @@
#include <math.h>
@ -962,8 +962,8 @@ Index: converter/ppm/ppmtowinicon.c
if (verbose)
Index: converter/ppm/ppmtoxpm.c
===================================================================
--- converter/ppm/ppmtoxpm.c.orig 2014-09-08 09:56:03.612026809 +0200
+++ converter/ppm/ppmtoxpm.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/ppmtoxpm.c.orig 2014-11-18 17:13:07.410792232 +0100
+++ converter/ppm/ppmtoxpm.c 2014-11-19 10:04:24.742745599 +0100
@@ -197,6 +197,7 @@
unsigned int i;
@ -982,8 +982,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 2014-09-08 09:56:02.852026822 +0200
+++ converter/ppm/qrttoppm.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/qrttoppm.c.orig 2014-11-18 17:13:06.503780163 +0100
+++ converter/ppm/qrttoppm.c 2014-11-19 10:04:24.742745599 +0100
@@ -46,7 +46,7 @@
ppm_writeppminit( stdout, cols, rows, maxval, 0 );
@ -995,8 +995,8 @@ Index: converter/ppm/qrttoppm.c
Index: converter/ppm/sldtoppm.c
===================================================================
--- converter/ppm/sldtoppm.c.orig 2014-09-08 09:56:03.608026809 +0200
+++ converter/ppm/sldtoppm.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/sldtoppm.c.orig 2014-11-18 17:13:07.408792205 +0100
+++ converter/ppm/sldtoppm.c 2014-11-19 10:04:24.742745599 +0100
@@ -464,6 +464,8 @@
/* Allocate image buffer and clear it to black. */
@ -1008,8 +1008,8 @@ Index: converter/ppm/sldtoppm.c
ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
Index: converter/ppm/ximtoppm.c
===================================================================
--- converter/ppm/ximtoppm.c.orig 2014-09-08 09:56:03.608026809 +0200
+++ converter/ppm/ximtoppm.c 2014-09-08 10:01:32.612021171 +0200
--- converter/ppm/ximtoppm.c.orig 2014-11-18 17:13:07.409792219 +0100
+++ converter/ppm/ximtoppm.c 2014-11-19 10:04:24.742745599 +0100
@@ -117,6 +117,7 @@
header->bits_channel = atoi(a_head.bits_per_channel);
header->alpha_flag = atoi(a_head.alpha_channel);
@ -1044,8 +1044,8 @@ Index: converter/ppm/ximtoppm.c
if (header->colors == NULL) {
Index: editor/pamcut.c
===================================================================
--- editor/pamcut.c.orig 2014-09-08 09:56:00.128026869 +0200
+++ editor/pamcut.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pamcut.c.orig 2014-11-18 17:13:03.751743537 +0100
+++ editor/pamcut.c 2014-11-19 10:04:24.742745599 +0100
@@ -655,6 +655,8 @@
outpam = inpam; /* Initial value -- most fields should be same */
@ -1057,8 +1057,8 @@ Index: editor/pamcut.c
Index: editor/pbmreduce.c
===================================================================
--- editor/pbmreduce.c.orig 2014-09-08 09:56:00.132026868 +0200
+++ editor/pbmreduce.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pbmreduce.c.orig 2014-11-18 17:13:03.753743563 +0100
+++ editor/pbmreduce.c 2014-11-19 10:04:24.743745612 +0100
@@ -94,6 +94,7 @@
if (halftone == QT_FS) {
unsigned int col;
@ -1069,8 +1069,8 @@ Index: editor/pbmreduce.c
if (thiserr == NULL || nexterr == NULL)
Index: editor/pnmgamma.c
===================================================================
--- editor/pnmgamma.c.orig 2014-09-08 09:56:00.304026866 +0200
+++ editor/pnmgamma.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmgamma.c.orig 2014-11-18 17:13:03.910745652 +0100
+++ editor/pnmgamma.c 2014-11-19 10:04:24.743745612 +0100
@@ -586,6 +586,7 @@
xelval ** const btableP) {
@ -1081,8 +1081,8 @@ Index: editor/pnmgamma.c
MALLOCARRAY(*btableP, maxval+1);
Index: editor/pnmhisteq.c
===================================================================
--- editor/pnmhisteq.c.orig 2014-09-08 09:56:00.132026868 +0200
+++ editor/pnmhisteq.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmhisteq.c.orig 2014-11-18 17:13:03.753743563 +0100
+++ editor/pnmhisteq.c 2014-11-19 10:04:24.743745612 +0100
@@ -103,6 +103,7 @@
unsigned int pixelCount;
unsigned int * lumahist;
@ -1093,8 +1093,8 @@ Index: editor/pnmhisteq.c
pm_error("Out of storage allocating array for %u histogram elements",
Index: editor/pnmindex.csh
===================================================================
--- editor/pnmindex.csh.orig 2014-09-08 10:01:32.596021171 +0200
+++ editor/pnmindex.csh 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmindex.csh.orig 2014-11-19 10:04:24.723745344 +0100
+++ editor/pnmindex.csh 2014-11-19 10:04:24.743745612 +0100
@@ -1,5 +1,8 @@
#!/bin/csh -f
#
@ -1106,8 +1106,8 @@ Index: editor/pnmindex.csh
# Copyright (C) 1991 by Jef Poskanzer.
Index: editor/pnmpad.c
===================================================================
--- editor/pnmpad.c.orig 2014-09-08 09:56:00.244026867 +0200
+++ editor/pnmpad.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmpad.c.orig 2014-11-18 17:13:03.859744973 +0100
+++ editor/pnmpad.c 2014-11-19 10:04:24.743745612 +0100
@@ -527,6 +527,8 @@
computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
@ -1119,8 +1119,8 @@ Index: editor/pnmpad.c
if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
Index: editor/pnmremap.c
===================================================================
--- editor/pnmremap.c.orig 2014-09-08 09:56:00.128026869 +0200
+++ editor/pnmremap.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmremap.c.orig 2014-11-18 17:13:03.750743523 +0100
+++ editor/pnmremap.c 2014-11-19 10:04:24.744745625 +0100
@@ -427,7 +427,7 @@
unsigned int plane;
@ -1140,8 +1140,8 @@ Index: editor/pnmremap.c
for (plane = 0; plane < pamP->depth; ++plane)
Index: editor/pnmscalefixed.c
===================================================================
--- editor/pnmscalefixed.c.orig 2014-09-08 09:56:00.244026867 +0200
+++ editor/pnmscalefixed.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmscalefixed.c.orig 2014-11-18 17:13:03.860744986 +0100
+++ editor/pnmscalefixed.c 2014-11-19 10:04:24.744745625 +0100
@@ -214,6 +214,8 @@
const int rows, const int cols,
int * newrowsP, int * newcolsP) {
@ -1172,8 +1172,8 @@ Index: editor/pnmscalefixed.c
Index: editor/pnmshear.c
===================================================================
--- editor/pnmshear.c.orig 2014-09-08 09:56:00.132026868 +0200
+++ editor/pnmshear.c 2014-09-08 10:01:32.612021171 +0200
--- editor/pnmshear.c.orig 2014-11-18 17:13:03.754743576 +0100
+++ editor/pnmshear.c 2014-11-19 10:04:24.744745625 +0100
@@ -15,6 +15,7 @@
#include <assert.h>
#include <math.h>
@ -1196,8 +1196,8 @@ Index: editor/pnmshear.c
pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
Index: editor/ppmdither.c
===================================================================
--- editor/ppmdither.c.orig 2014-09-08 09:56:00.132026868 +0200
+++ editor/ppmdither.c 2014-09-08 10:01:32.612021171 +0200
--- editor/ppmdither.c.orig 2014-11-18 17:13:03.756743603 +0100
+++ editor/ppmdither.c 2014-11-19 10:04:24.744745625 +0100
@@ -355,7 +355,11 @@
unsigned int const dithMatSize =
(dithDim * sizeof(*dithMat)) + /* pointers */
@ -1213,8 +1213,8 @@ Index: editor/ppmdither.c
if (dithMat == NULL)
Index: editor/specialty/pamoil.c
===================================================================
--- editor/specialty/pamoil.c.orig 2014-09-08 09:56:00.136026868 +0200
+++ editor/specialty/pamoil.c 2014-09-08 10:01:32.612021171 +0200
--- editor/specialty/pamoil.c.orig 2014-11-18 17:13:03.758743629 +0100
+++ editor/specialty/pamoil.c 2014-11-19 10:04:24.744745625 +0100
@@ -112,6 +112,7 @@
tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
pm_close(ifp);
@ -1225,8 +1225,8 @@ Index: editor/specialty/pamoil.c
pm_error("Unable to allocate memory for histogram.");
Index: generator/pbmtext.c
===================================================================
--- generator/pbmtext.c.orig 2014-09-08 09:56:00.404026864 +0200
+++ generator/pbmtext.c 2014-09-08 10:01:32.612021171 +0200
--- generator/pbmtext.c.orig 2014-11-18 17:13:04.004746903 +0100
+++ generator/pbmtext.c 2014-11-19 10:04:24.745745639 +0100
@@ -96,12 +96,14 @@
for (i = 1; i < argc; ++i) {
@ -1258,23 +1258,10 @@ Index: generator/pbmtext.c
hmargin = 2 * fontP->maxwidth;
}
}
Index: generator/pgmcrater.c
===================================================================
--- generator/pgmcrater.c.orig 2014-09-08 09:56:00.404026864 +0200
+++ generator/pgmcrater.c 2014-09-08 10:01:32.612021171 +0200
@@ -250,7 +250,7 @@
/* Acquire the elevation array and initialize it to mean
surface elevation. */
- MALLOCARRAY(aux, SCRX * SCRY);
+ aux = (unsigned short *) malloc3(SCRX, SCRY, sizeof(short));
if (aux == NULL)
pm_error("out of memory allocating elevation array");
Index: generator/pgmkernel.c
===================================================================
--- generator/pgmkernel.c.orig 2014-09-08 09:56:00.404026864 +0200
+++ generator/pgmkernel.c 2014-09-08 10:01:32.612021171 +0200
--- generator/pgmkernel.c.orig 2014-11-18 17:13:04.004746903 +0100
+++ generator/pgmkernel.c 2014-11-19 10:04:24.745745639 +0100
@@ -214,6 +214,7 @@
/* Output matrix is symmetric vertically and horizontally. */
@ -1285,8 +1272,8 @@ Index: generator/pgmkernel.c
halfKernel = pgm_allocarray(cmdline.cols, arows);
Index: lib/libpam.c
===================================================================
--- lib/libpam.c.orig 2014-09-08 09:56:01.044026853 +0200
+++ lib/libpam.c 2014-09-08 10:01:32.612021171 +0200
--- lib/libpam.c.orig 2014-11-18 17:13:04.613755008 +0100
+++ lib/libpam.c 2014-11-19 10:04:24.745745639 +0100
@@ -223,7 +223,8 @@
unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
tuple * tuplerow;
@ -1299,8 +1286,8 @@ Index: lib/libpam.c
/* Now we initialize the pointers to the individual tuples
Index: lib/libpammap.c
===================================================================
--- lib/libpammap.c.orig 2014-09-08 09:56:01.044026853 +0200
+++ lib/libpammap.c 2014-09-08 10:01:32.612021171 +0200
--- lib/libpammap.c.orig 2014-11-18 17:13:04.612754992 +0100
+++ lib/libpammap.c 2014-11-19 10:04:24.745745639 +0100
@@ -107,6 +107,8 @@
*/
struct tupleint_list_item * retval;
@ -1312,8 +1299,8 @@ Index: lib/libpammap.c
+ pamP->depth * sizeof(sample);
Index: lib/libpbm1.c
===================================================================
--- lib/libpbm1.c.orig 2014-09-08 09:56:01.048026853 +0200
+++ lib/libpbm1.c 2014-09-08 10:01:32.612021171 +0200
--- lib/libpbm1.c.orig 2014-11-18 17:13:04.619755087 +0100
+++ lib/libpbm1.c 2014-11-19 10:04:24.746745652 +0100
@@ -78,6 +78,7 @@
} else {
pm_filepos const bytesPerRow = (cols+7)/8;
@ -1324,9 +1311,9 @@ Index: lib/libpbm1.c
}
Index: lib/libpm.c
===================================================================
--- lib/libpm.c.orig 2014-09-08 10:01:32.588021171 +0200
+++ lib/libpm.c 2014-09-08 10:01:32.616021171 +0200
@@ -805,4 +805,53 @@
--- lib/libpm.c.orig 2014-11-19 10:04:24.716745250 +0100
+++ lib/libpm.c 2014-11-19 10:04:24.746745652 +0100
@@ -830,4 +830,53 @@
}
@ -1382,8 +1369,8 @@ Index: lib/libpm.c
Index: lib/pm.h
===================================================================
--- lib/pm.h.orig 2014-09-08 09:56:01.048026853 +0200
+++ lib/pm.h 2014-09-08 10:01:32.616021171 +0200
--- lib/pm.h.orig 2014-11-18 17:13:04.617755062 +0100
+++ lib/pm.h 2014-11-19 10:04:24.746745652 +0100
@@ -432,4 +432,11 @@
#endif
@ -1398,8 +1385,8 @@ Index: lib/pm.h
#endif
Index: other/pnmcolormap.c
===================================================================
--- other/pnmcolormap.c.orig 2014-09-08 09:55:59.756026875 +0200
+++ other/pnmcolormap.c 2014-09-08 10:01:32.616021171 +0200
--- other/pnmcolormap.c.orig 2014-11-18 17:13:03.336738013 +0100
+++ other/pnmcolormap.c 2014-11-19 10:04:24.746745652 +0100
@@ -840,6 +840,7 @@
pamP->width = intsqrt;
else
@ -1410,8 +1397,8 @@ Index: other/pnmcolormap.c
unsigned int const intQuotient = colormap.size / pamP->width;
Index: urt/README
===================================================================
--- urt/README.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/README 2014-09-08 10:01:32.616021171 +0200
--- urt/README.orig 2014-11-18 17:13:07.691795971 +0100
+++ urt/README 2014-11-19 10:04:24.746745652 +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
@ -1423,8 +1410,8 @@ Index: urt/README
+Alan Cox <alan@redhat.com>
Index: urt/rle_addhist.c
===================================================================
--- urt/rle_addhist.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/rle_addhist.c 2014-09-08 10:01:32.616021171 +0200
--- urt/rle_addhist.c.orig 2014-11-18 17:13:07.692795985 +0100
+++ urt/rle_addhist.c 2014-11-19 10:04:24.746745652 +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,
@ -1471,8 +1458,8 @@ Index: urt/rle_addhist.c
MALLOCARRAY(newc, length);
Index: urt/rle_getrow.c
===================================================================
--- urt/rle_getrow.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/rle_getrow.c 2014-09-08 10:01:32.616021171 +0200
--- urt/rle_getrow.c.orig 2014-11-18 17:13:07.691795971 +0100
+++ urt/rle_getrow.c 2014-11-19 10:04:24.747745666 +0100
@@ -17,6 +17,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -1492,8 +1479,8 @@ Index: urt/rle_getrow.c
{
Index: urt/rle_hdr.c
===================================================================
--- urt/rle_hdr.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/rle_hdr.c 2014-09-08 10:01:32.616021171 +0200
--- urt/rle_hdr.c.orig 2014-11-18 17:13:07.692795985 +0100
+++ urt/rle_hdr.c 2014-11-19 10:04:24.747745666 +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,
@ -1562,8 +1549,8 @@ Index: urt/rle_hdr.c
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
Index: urt/rle.h
===================================================================
--- urt/rle.h.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/rle.h 2014-09-08 10:01:32.616021171 +0200
--- urt/rle.h.orig 2014-11-18 17:13:07.693795998 +0100
+++ urt/rle.h 2014-11-19 10:04:24.747745666 +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,
@ -1594,8 +1581,8 @@ Index: urt/rle.h
Index: urt/rle_open_f.c
===================================================================
--- urt/rle_open_f.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/rle_open_f.c 2014-09-08 10:01:32.616021171 +0200
--- urt/rle_open_f.c.orig 2014-11-18 17:13:07.691795971 +0100
+++ urt/rle_open_f.c 2014-11-19 10:04:24.747745666 +0100
@@ -163,65 +163,7 @@
FILE ** const fpP,
bool * const noSubprocessP,
@ -1664,8 +1651,8 @@ Index: urt/rle_open_f.c
Index: urt/rle_putcom.c
===================================================================
--- urt/rle_putcom.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/rle_putcom.c 2014-09-08 10:01:32.616021171 +0200
--- urt/rle_putcom.c.orig 2014-11-18 17:13:07.691795971 +0100
+++ urt/rle_putcom.c 2014-11-19 10:04:24.747745666 +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,
@ -1693,8 +1680,8 @@ Index: urt/rle_putcom.c
* comments block. Of course, if this were true, then the
Index: urt/Runput.c
===================================================================
--- urt/Runput.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/Runput.c 2014-09-08 10:01:32.616021171 +0200
--- urt/Runput.c.orig 2014-11-18 17:13:07.693795998 +0100
+++ urt/Runput.c 2014-11-19 10:04:24.748745679 +0100
@@ -17,6 +17,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
@ -1729,8 +1716,8 @@ Index: urt/Runput.c
fprintf( stderr,
Index: urt/scanargs.c
===================================================================
--- urt/scanargs.c.orig 2014-09-08 09:56:03.956026803 +0200
+++ urt/scanargs.c 2014-09-08 10:01:32.616021171 +0200
--- urt/scanargs.c.orig 2014-11-18 17:13:07.689795944 +0100
+++ urt/scanargs.c 2014-11-19 10:04:24.748745679 +0100
@@ -38,6 +38,8 @@
*
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire

12
netpbm.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Nov 19 09:11:12 UTC 2014 - pgajdos@suse.com
- updated to 10.68.1
* pnmconvol: add -bias .
* Remove pnmcomp, install a pnmcomp symlink for pamcomp.
* Fix incorrect option parsing when there are multiple common
options (e.g. -plain -quiet).
* cameratopam: fix buffer overflow.
* cameratopam: fix incorrect output.
* ppmtopict: Fix unconditional crash.
-------------------------------------------------------------------
Mon Sep 8 08:17:28 UTC 2014 - pgajdos@suse.com

4
netpbm.spec
View File

@ -17,11 +17,11 @@
%define libmaj 11
%define libmin 67
%define libmin 68
%define libver %{libmaj}.%{libmin}
Name: netpbm
Version: 10.67.4
Version: 10.68.1
Release: 0
Summary: A Powerful Graphics Conversion Package
License: BSD-3-Clause and GPL-2.0+ and IJG and MIT and SUSE-Public-Domain