Accepting request 228426 from graphics
- updated to 10.66.00 * Add pamvalidate. * Add pamfix: Does what pamfixtrunc did, plus repairs excessive sample values. * pgmramp: add -diagonal. * libnetpbm: Read functions validate that sample values do not exceed maxval. * etc. see HISTORY for details OBS-URL: https://build.opensuse.org/request/show/228426 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/netpbm?expand=0&rev=48
This commit is contained in:
commit
d93ebf244a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b81278fbc1ed9d7d4c8a62384c5f9b992132534be5dbbcfbca0b110523e8bbd9
|
||||
size 590676
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cc8707a9487ad78d67139277384744ee39727bbfaa7f320012fbca88d14616eb
|
||||
size 1777760
|
3
netpbm-10.66.0-documentation.tar.bz2
Normal file
3
netpbm-10.66.0-documentation.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:afb552da451769aab9e3a77045b26ff2f2884ea6232ac6f7c430c87990994cfe
|
||||
size 593039
|
3
netpbm-10.66.0-nohpcdtoppm-noppmtompeg.tar.bz2
Normal file
3
netpbm-10.66.0-nohpcdtoppm-noppmtompeg.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:308e003fb4e7502c5487f67f42e9f2e840eda1013a8b721622e76358db0d714c
|
||||
size 1795528
|
@ -1,7 +1,7 @@
|
||||
Index: analyzer/pgmtexture.c
|
||||
===================================================================
|
||||
--- analyzer/pgmtexture.c.orig 2013-11-27 08:57:00.035858112 +0100
|
||||
+++ analyzer/pgmtexture.c 2013-11-27 09:07:09.521166720 +0100
|
||||
--- analyzer/pgmtexture.c.orig 2014-04-01 11:08:57.571334223 +0200
|
||||
+++ analyzer/pgmtexture.c 2014-04-01 11:11:56.238523833 +0200
|
||||
@@ -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 2013-11-27 08:57:04.594912778 +0100
|
||||
+++ converter/other/gemtopnm.c 2013-11-27 09:07:09.521166720 +0100
|
||||
--- converter/other/gemtopnm.c.orig 2014-04-01 11:09:00.724372879 +0200
|
||||
+++ converter/other/gemtopnm.c 2014-04-01 11:11:56.238523833 +0200
|
||||
@@ -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 2013-11-27 08:57:03.302897286 +0100
|
||||
+++ converter/other/jpegtopnm.c 2013-11-27 09:07:09.522166732 +0100
|
||||
--- converter/other/jpegtopnm.c.orig 2014-04-01 11:08:59.787361391 +0200
|
||||
+++ converter/other/jpegtopnm.c 2014-04-01 11:11:56.239523845 +0200
|
||||
@@ -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 2013-11-27 08:57:04.594912778 +0100
|
||||
+++ converter/other/pbmtopgm.c 2013-11-27 09:07:09.522166732 +0100
|
||||
--- converter/other/pbmtopgm.c.orig 2014-04-01 11:09:00.724372879 +0200
|
||||
+++ converter/other/pbmtopgm.c 2014-04-01 11:11:56.239523845 +0200
|
||||
@@ -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 2013-11-27 08:57:04.729914397 +0100
|
||||
+++ converter/other/pnmtoddif.c 2013-11-27 09:07:09.522166732 +0100
|
||||
--- converter/other/pnmtoddif.c.orig 2014-04-01 11:09:00.817374019 +0200
|
||||
+++ converter/other/pnmtoddif.c 2014-04-01 11:11:56.239523845 +0200
|
||||
@@ -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 2013-11-27 08:57:02.351885883 +0100
|
||||
+++ converter/other/pnmtojpeg.c 2013-11-27 09:07:09.523166744 +0100
|
||||
--- converter/other/pnmtojpeg.c.orig 2014-04-01 11:08:59.297355384 +0200
|
||||
+++ converter/other/pnmtojpeg.c 2014-04-01 11:11:56.239523845 +0200
|
||||
@@ -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 2013-11-27 08:57:03.301897274 +0100
|
||||
+++ converter/other/pnmtops.c 2013-11-27 09:07:09.523166744 +0100
|
||||
@@ -289,17 +289,21 @@
|
||||
--- converter/other/pnmtops.c.orig 2014-04-01 11:08:59.786361379 +0200
|
||||
+++ converter/other/pnmtops.c 2014-04-01 11:11:56.240523858 +0200
|
||||
@@ -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 2013-11-27 08:57:04.589912718 +0100
|
||||
+++ converter/other/pnmtorle.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/pnmtorle.c.orig 2014-04-01 11:09:00.719372817 +0200
|
||||
+++ converter/other/pnmtorle.c 2014-04-01 11:11:56.240523858 +0200
|
||||
@@ -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 2013-11-27 08:57:04.595912790 +0100
|
||||
+++ converter/other/pnmtosgi.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/pnmtosgi.c.orig 2014-04-01 11:09:00.727372916 +0200
|
||||
+++ converter/other/pnmtosgi.c 2014-04-01 11:11:56.240523858 +0200
|
||||
@@ -254,6 +254,7 @@
|
||||
#endif
|
||||
|
||||
@ -182,8 +182,8 @@ Index: converter/other/pnmtosgi.c
|
||||
MALLOCARRAY(p, len);
|
||||
Index: converter/other/rletopnm.c
|
||||
===================================================================
|
||||
--- converter/other/rletopnm.c.orig 2013-11-27 08:57:04.589912718 +0100
|
||||
+++ converter/other/rletopnm.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/rletopnm.c.orig 2014-04-01 11:09:00.718372805 +0200
|
||||
+++ converter/other/rletopnm.c 2014-04-01 11:11:56.241523870 +0200
|
||||
@@ -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,
|
||||
@ -195,8 +195,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 2013-11-27 08:57:04.596912802 +0100
|
||||
+++ converter/other/sgitopnm.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/sgitopnm.c.orig 2014-04-01 11:09:00.727372916 +0200
|
||||
+++ converter/other/sgitopnm.c 2014-04-01 11:11:56.241523870 +0200
|
||||
@@ -359,10 +359,14 @@
|
||||
MALLOCARRAY_NOFAIL(image, head->ysize);
|
||||
} else {
|
||||
@ -215,8 +215,8 @@ Index: converter/other/sgitopnm.c
|
||||
unsigned int row;
|
||||
Index: converter/other/sirtopnm.c
|
||||
===================================================================
|
||||
--- converter/other/sirtopnm.c.orig 2013-11-27 08:57:04.592912754 +0100
|
||||
+++ converter/other/sirtopnm.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/sirtopnm.c.orig 2014-04-01 11:09:00.721372842 +0200
|
||||
+++ converter/other/sirtopnm.c 2014-04-01 11:11:56.241523870 +0200
|
||||
@@ -69,6 +69,7 @@
|
||||
}
|
||||
break;
|
||||
@ -227,8 +227,8 @@ Index: converter/other/sirtopnm.c
|
||||
if ( !( sirarray = (unsigned char*) malloc( picsize ) ) )
|
||||
Index: converter/other/tifftopnm.c
|
||||
===================================================================
|
||||
--- converter/other/tifftopnm.c.orig 2013-11-27 08:57:04.596912802 +0100
|
||||
+++ converter/other/tifftopnm.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/tifftopnm.c.orig 2014-04-01 11:09:00.728372928 +0200
|
||||
+++ converter/other/tifftopnm.c 2014-04-01 11:11:56.242523882 +0200
|
||||
@@ -1279,7 +1279,9 @@
|
||||
if (scanbuf == NULL)
|
||||
pm_error("can't allocate memory for scanline buffer");
|
||||
@ -242,8 +242,8 @@ Index: converter/other/tifftopnm.c
|
||||
|
||||
Index: converter/other/xwdtopnm.c
|
||||
===================================================================
|
||||
--- converter/other/xwdtopnm.c.orig 2013-11-27 08:57:03.483899456 +0100
|
||||
+++ converter/other/xwdtopnm.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/other/xwdtopnm.c.orig 2014-04-01 11:08:59.937363230 +0200
|
||||
+++ converter/other/xwdtopnm.c 2014-04-01 11:11:56.242523882 +0200
|
||||
@@ -209,6 +209,10 @@
|
||||
*colorsP = pnm_allocrow(2);
|
||||
PNM_ASSIGN1((*colorsP)[0], 0);
|
||||
@ -265,8 +265,8 @@ Index: converter/other/xwdtopnm.c
|
||||
h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
|
||||
Index: converter/pbm/mdatopbm.c
|
||||
===================================================================
|
||||
--- converter/pbm/mdatopbm.c.orig 2013-11-27 08:57:06.796939182 +0100
|
||||
+++ converter/pbm/mdatopbm.c 2013-11-27 09:07:09.524166756 +0100
|
||||
--- converter/pbm/mdatopbm.c.orig 2014-04-01 11:09:01.991388412 +0200
|
||||
+++ converter/pbm/mdatopbm.c 2014-04-01 11:11:56.242523882 +0200
|
||||
@@ -245,10 +245,13 @@
|
||||
pm_readlittleshort(infile, &yy); nInCols = yy;
|
||||
}
|
||||
@ -284,8 +284,8 @@ Index: converter/pbm/mdatopbm.c
|
||||
|
||||
Index: converter/pbm/mgrtopbm.c
|
||||
===================================================================
|
||||
--- converter/pbm/mgrtopbm.c.orig 2013-11-27 08:57:07.250944626 +0100
|
||||
+++ converter/pbm/mgrtopbm.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/mgrtopbm.c.orig 2014-04-01 11:09:02.082389528 +0200
|
||||
+++ converter/pbm/mgrtopbm.c 2014-04-01 11:11:56.242523882 +0200
|
||||
@@ -65,6 +65,8 @@
|
||||
if (head.h_high < ' ' || head.l_high < ' ')
|
||||
pm_error("Invalid width field in MGR header");
|
||||
@ -297,8 +297,8 @@ Index: converter/pbm/mgrtopbm.c
|
||||
*padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
|
||||
Index: converter/pbm/pbmtogem.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtogem.c.orig 2013-11-27 08:57:06.797939194 +0100
|
||||
+++ converter/pbm/pbmtogem.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtogem.c.orig 2014-04-01 11:09:01.993388437 +0200
|
||||
+++ converter/pbm/pbmtogem.c 2014-04-01 11:11:56.243523894 +0200
|
||||
@@ -79,6 +79,7 @@
|
||||
bitsperitem = 0;
|
||||
bitshift = 7;
|
||||
@ -309,8 +309,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 2013-11-27 08:57:07.248944602 +0100
|
||||
+++ converter/pbm/pbmtogo.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtogo.c.orig 2014-04-01 11:09:02.078389479 +0200
|
||||
+++ converter/pbm/pbmtogo.c 2014-04-01 11:11:56.243523894 +0200
|
||||
@@ -158,6 +158,7 @@
|
||||
bitrow = pbm_allocrow(cols);
|
||||
|
||||
@ -321,8 +321,8 @@ Index: converter/pbm/pbmtogo.c
|
||||
rucols = rucols * 8;
|
||||
Index: converter/pbm/pbmtolj.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtolj.c.orig 2013-11-27 08:57:06.797939194 +0100
|
||||
+++ converter/pbm/pbmtolj.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtolj.c.orig 2014-04-01 11:09:01.992388424 +0200
|
||||
+++ converter/pbm/pbmtolj.c 2014-04-01 11:11:56.243523894 +0200
|
||||
@@ -120,7 +120,11 @@
|
||||
static void
|
||||
allocateBuffers(unsigned int const cols) {
|
||||
@ -337,8 +337,8 @@ Index: converter/pbm/pbmtolj.c
|
||||
|
||||
Index: converter/pbm/pbmtomacp.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtomacp.c.orig 2013-11-27 08:57:06.799939218 +0100
|
||||
+++ converter/pbm/pbmtomacp.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtomacp.c.orig 2014-04-01 11:09:01.997388486 +0200
|
||||
+++ converter/pbm/pbmtomacp.c 2014-04-01 11:11:56.243523894 +0200
|
||||
@@ -101,6 +101,7 @@
|
||||
if( !lflg )
|
||||
left = 0;
|
||||
@ -358,8 +358,8 @@ Index: converter/pbm/pbmtomacp.c
|
||||
bottom = top + MAX_LINES - 1;
|
||||
Index: converter/pbm/pbmtomda.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtomda.c.orig 2013-11-27 08:57:07.248944602 +0100
|
||||
+++ converter/pbm/pbmtomda.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtomda.c.orig 2014-04-01 11:09:02.077389466 +0200
|
||||
+++ converter/pbm/pbmtomda.c 2014-04-01 11:11:56.243523894 +0200
|
||||
@@ -179,6 +179,7 @@
|
||||
|
||||
nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
|
||||
@ -370,8 +370,8 @@ Index: converter/pbm/pbmtomda.c
|
||||
nOutCols = nInCols / 8;
|
||||
Index: converter/pbm/pbmtoppa/pbm.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtoppa/pbm.c.orig 2013-11-27 08:57:06.801939242 +0100
|
||||
+++ converter/pbm/pbmtoppa/pbm.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtoppa/pbm.c.orig 2014-04-01 11:09:02.000388522 +0200
|
||||
+++ converter/pbm/pbmtoppa/pbm.c 2014-04-01 11:11:56.244523907 +0200
|
||||
@@ -105,6 +105,7 @@
|
||||
return 0;
|
||||
|
||||
@ -392,8 +392,8 @@ Index: converter/pbm/pbmtoppa/pbm.c
|
||||
}
|
||||
Index: converter/pbm/pbmtoppa/pbmtoppa.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtoppa/pbmtoppa.c.orig 2013-11-27 08:57:06.802939254 +0100
|
||||
+++ converter/pbm/pbmtoppa/pbmtoppa.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtoppa/pbmtoppa.c.orig 2014-04-01 11:09:02.001388535 +0200
|
||||
+++ converter/pbm/pbmtoppa/pbmtoppa.c 2014-04-01 11:11:56.244523907 +0200
|
||||
@@ -441,6 +441,7 @@
|
||||
pm_error("main(): unrecognized parameter '%s'", argv[argn]);
|
||||
}
|
||||
@ -404,8 +404,8 @@ Index: converter/pbm/pbmtoppa/pbmtoppa.c
|
||||
|
||||
Index: converter/pbm/pbmtoxbm.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtoxbm.c.orig 2013-11-27 08:57:07.250944626 +0100
|
||||
+++ converter/pbm/pbmtoxbm.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtoxbm.c.orig 2014-04-01 11:09:02.082389528 +0200
|
||||
+++ converter/pbm/pbmtoxbm.c 2014-04-01 11:11:56.244523907 +0200
|
||||
@@ -335,6 +335,8 @@
|
||||
|
||||
unsigned char * bitrow;
|
||||
@ -417,8 +417,8 @@ Index: converter/pbm/pbmtoxbm.c
|
||||
|
||||
Index: converter/pbm/pbmtoybm.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtoybm.c.orig 2013-11-27 08:57:07.250944626 +0100
|
||||
+++ converter/pbm/pbmtoybm.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtoybm.c.orig 2014-04-01 11:09:02.082389528 +0200
|
||||
+++ converter/pbm/pbmtoybm.c 2014-04-01 11:11:56.244523907 +0200
|
||||
@@ -113,6 +113,7 @@
|
||||
bitrow = pbm_allocrow(cols);
|
||||
|
||||
@ -429,8 +429,8 @@ Index: converter/pbm/pbmtoybm.c
|
||||
putinit(cols, rows);
|
||||
Index: converter/pbm/pbmtozinc.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmtozinc.c.orig 2013-11-27 08:57:07.248944602 +0100
|
||||
+++ converter/pbm/pbmtozinc.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmtozinc.c.orig 2014-04-01 11:09:02.077389466 +0200
|
||||
+++ converter/pbm/pbmtozinc.c 2014-04-01 11:11:56.244523907 +0200
|
||||
@@ -65,6 +65,7 @@
|
||||
bitrow = pbm_allocrow( cols );
|
||||
|
||||
@ -441,8 +441,8 @@ Index: converter/pbm/pbmtozinc.c
|
||||
printf( "USHORT %s[] = {\n",name);
|
||||
Index: converter/pbm/pbmto10x.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmto10x.c.orig 2013-11-27 08:57:06.797939194 +0100
|
||||
+++ converter/pbm/pbmto10x.c 2013-11-27 09:07:09.525166768 +0100
|
||||
--- converter/pbm/pbmto10x.c.orig 2014-04-01 11:09:01.993388437 +0200
|
||||
+++ converter/pbm/pbmto10x.c 2014-04-01 11:11:56.245523919 +0200
|
||||
@@ -162,7 +162,7 @@
|
||||
res_60x72();
|
||||
|
||||
@ -454,8 +454,8 @@ Index: converter/pbm/pbmto10x.c
|
||||
|
||||
Index: converter/pbm/pbmto4425.c
|
||||
===================================================================
|
||||
--- converter/pbm/pbmto4425.c.orig 2013-11-27 08:57:06.796939182 +0100
|
||||
+++ converter/pbm/pbmto4425.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/pbm/pbmto4425.c.orig 2014-04-01 11:09:01.990388400 +0200
|
||||
+++ converter/pbm/pbmto4425.c 2014-04-01 11:11:56.245523919 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "nstring.h"
|
||||
@ -475,8 +475,8 @@ Index: converter/pbm/pbmto4425.c
|
||||
pm_error( "Cannot allocate memory" );
|
||||
Index: converter/pbm/pktopbm.c
|
||||
===================================================================
|
||||
--- converter/pbm/pktopbm.c.orig 2013-11-27 08:57:06.797939194 +0100
|
||||
+++ converter/pbm/pktopbm.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/pbm/pktopbm.c.orig 2014-04-01 11:09:01.994388449 +0200
|
||||
+++ converter/pbm/pktopbm.c 2014-04-01 11:11:56.245523919 +0200
|
||||
@@ -277,6 +277,7 @@
|
||||
if (flagbyte == 7) { /* long form preamble */
|
||||
integer packetlength = get32() ; /* character packet length */
|
||||
@ -487,8 +487,8 @@ Index: converter/pbm/pktopbm.c
|
||||
if ((car >= MAXPKCHAR) || !filename[car]) {
|
||||
Index: converter/pbm/thinkjettopbm.l
|
||||
===================================================================
|
||||
--- converter/pbm/thinkjettopbm.l.orig 2013-11-27 08:57:07.250944626 +0100
|
||||
+++ converter/pbm/thinkjettopbm.l 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/pbm/thinkjettopbm.l.orig 2014-04-01 11:09:02.083389540 +0200
|
||||
+++ converter/pbm/thinkjettopbm.l 2014-04-01 11:11:56.245523919 +0200
|
||||
@@ -114,7 +114,9 @@
|
||||
<RASTERMODE>\033\*b{DIG}+W {
|
||||
int l;
|
||||
@ -510,8 +510,8 @@ Index: converter/pbm/thinkjettopbm.l
|
||||
packed_bitrow = malloc(maxRowLength);
|
||||
Index: converter/pbm/ybmtopbm.c
|
||||
===================================================================
|
||||
--- converter/pbm/ybmtopbm.c.orig 2013-11-27 08:57:06.800939230 +0100
|
||||
+++ converter/pbm/ybmtopbm.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/pbm/ybmtopbm.c.orig 2014-04-01 11:09:01.998388498 +0200
|
||||
+++ converter/pbm/ybmtopbm.c 2014-04-01 11:11:56.245523919 +0200
|
||||
@@ -49,6 +49,7 @@
|
||||
pm_error("EOF / read error");
|
||||
|
||||
@ -522,8 +522,8 @@ Index: converter/pbm/ybmtopbm.c
|
||||
|
||||
Index: converter/pgm/lispmtopgm.c
|
||||
===================================================================
|
||||
--- converter/pgm/lispmtopgm.c.orig 2013-11-27 08:57:04.793915164 +0100
|
||||
+++ converter/pgm/lispmtopgm.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/pgm/lispmtopgm.c.orig 2014-04-01 11:09:00.882374816 +0200
|
||||
+++ converter/pgm/lispmtopgm.c 2014-04-01 11:11:56.246523931 +0200
|
||||
@@ -58,6 +58,7 @@
|
||||
pm_error( "depth (%d bits) is too large", depth);
|
||||
|
||||
@ -545,8 +545,8 @@ Index: converter/pgm/lispmtopgm.c
|
||||
if ( *colsP != (cols_32 - *padrightP) ) {
|
||||
Index: converter/pgm/psidtopgm.c
|
||||
===================================================================
|
||||
--- converter/pgm/psidtopgm.c.orig 2013-11-27 08:57:04.792915152 +0100
|
||||
+++ converter/pgm/psidtopgm.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/pgm/psidtopgm.c.orig 2014-04-01 11:09:00.881374803 +0200
|
||||
+++ converter/pgm/psidtopgm.c 2014-04-01 11:11:56.246523931 +0200
|
||||
@@ -78,6 +78,7 @@
|
||||
pm_error("bits/sample (%d) is too large.", bitspersample);
|
||||
|
||||
@ -557,8 +557,8 @@ Index: converter/pgm/psidtopgm.c
|
||||
unsigned int col;
|
||||
Index: converter/ppm/ilbmtoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/ilbmtoppm.c.orig 2013-11-27 08:57:06.626937143 +0100
|
||||
+++ converter/ppm/ilbmtoppm.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/ppm/ilbmtoppm.c.orig 2014-04-01 11:09:01.846386634 +0200
|
||||
+++ converter/ppm/ilbmtoppm.c 2014-04-01 11:11:56.246523931 +0200
|
||||
@@ -592,6 +592,7 @@
|
||||
rawtype *chp;
|
||||
|
||||
@ -631,8 +631,8 @@ Index: converter/ppm/ilbmtoppm.c
|
||||
|
||||
Index: converter/ppm/imgtoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/imgtoppm.c.orig 2013-11-27 08:57:06.320933474 +0100
|
||||
+++ converter/ppm/imgtoppm.c 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/ppm/imgtoppm.c.orig 2014-04-01 11:09:01.675384538 +0200
|
||||
+++ converter/ppm/imgtoppm.c 2014-04-01 11:11:56.247523943 +0200
|
||||
@@ -84,6 +84,7 @@
|
||||
len = atoi((char*) buf );
|
||||
if ( fread( buf, len, 1, ifp ) != 1 )
|
||||
@ -651,8 +651,8 @@ Index: converter/ppm/imgtoppm.c
|
||||
"pixel data length (%d) does not match image size (%d)",
|
||||
Index: converter/ppm/Makefile
|
||||
===================================================================
|
||||
--- converter/ppm/Makefile.orig 2013-11-27 08:57:06.321933486 +0100
|
||||
+++ converter/ppm/Makefile 2013-11-27 09:07:09.526166781 +0100
|
||||
--- converter/ppm/Makefile.orig 2014-04-01 11:09:01.675384538 +0200
|
||||
+++ converter/ppm/Makefile 2014-04-01 11:11:56.247523943 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
|
||||
@ -664,8 +664,8 @@ Index: converter/ppm/Makefile
|
||||
ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
|
||||
Index: converter/ppm/pcxtoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/pcxtoppm.c.orig 2013-11-27 08:57:06.626937143 +0100
|
||||
+++ converter/ppm/pcxtoppm.c 2013-11-27 09:07:09.527166792 +0100
|
||||
--- converter/ppm/pcxtoppm.c.orig 2014-04-01 11:09:01.847386646 +0200
|
||||
+++ converter/ppm/pcxtoppm.c 2014-04-01 11:11:56.247523943 +0200
|
||||
@@ -409,6 +409,7 @@
|
||||
/*
|
||||
* clear the pixel buffer
|
||||
@ -684,8 +684,8 @@ Index: converter/ppm/pcxtoppm.c
|
||||
pm_message("warning - BytesPerLine = %d, "
|
||||
Index: converter/ppm/picttoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/picttoppm.c.orig 2013-11-27 08:57:06.627937155 +0100
|
||||
+++ converter/ppm/picttoppm.c 2013-11-27 09:07:09.527166792 +0100
|
||||
--- converter/ppm/picttoppm.c.orig 2014-04-01 11:09:01.848386659 +0200
|
||||
+++ converter/ppm/picttoppm.c 2014-04-01 11:11:56.248523955 +0200
|
||||
@@ -1,3 +1,5 @@
|
||||
+#error "Unfixable. Don't ship me"
|
||||
+
|
||||
@ -694,8 +694,8 @@ Index: converter/ppm/picttoppm.c
|
||||
*
|
||||
Index: converter/ppm/pjtoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/pjtoppm.c.orig 2013-11-27 08:57:06.621937083 +0100
|
||||
+++ converter/ppm/pjtoppm.c 2013-11-27 09:07:09.527166792 +0100
|
||||
--- converter/ppm/pjtoppm.c.orig 2014-04-01 11:09:01.839386548 +0200
|
||||
+++ converter/ppm/pjtoppm.c 2014-04-01 11:11:56.248523955 +0200
|
||||
@@ -127,19 +127,21 @@
|
||||
case 'V': /* send plane */
|
||||
case 'W': /* send last plane */
|
||||
@ -747,8 +747,8 @@ Index: converter/ppm/pjtoppm.c
|
||||
|
||||
Index: converter/ppm/ppmtoeyuv.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtoeyuv.c.orig 2013-11-27 08:57:05.045918186 +0100
|
||||
+++ converter/ppm/ppmtoeyuv.c 2013-11-27 09:07:09.527166792 +0100
|
||||
--- converter/ppm/ppmtoeyuv.c.orig 2014-04-01 11:09:00.999376250 +0200
|
||||
+++ converter/ppm/ppmtoeyuv.c 2014-04-01 11:11:56.248523955 +0200
|
||||
@@ -114,6 +114,7 @@
|
||||
|
||||
int index;
|
||||
@ -759,8 +759,8 @@ Index: converter/ppm/ppmtoeyuv.c
|
||||
MALLOCARRAY_NOFAIL(mult114 , maxval+1);
|
||||
Index: converter/ppm/ppmtoicr.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtoicr.c.orig 2013-11-27 08:57:06.321933486 +0100
|
||||
+++ converter/ppm/ppmtoicr.c 2013-11-27 09:07:09.527166792 +0100
|
||||
--- converter/ppm/ppmtoicr.c.orig 2014-04-01 11:09:01.675384538 +0200
|
||||
+++ converter/ppm/ppmtoicr.c 2014-04-01 11:11:56.248523955 +0200
|
||||
@@ -169,7 +169,7 @@
|
||||
|
||||
if (rleflag) {
|
||||
@ -772,8 +772,8 @@ Index: converter/ppm/ppmtoicr.c
|
||||
for (j=0; j<cols; j++)
|
||||
Index: converter/ppm/ppmtoilbm.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtoilbm.c.orig 2013-11-27 08:57:05.045918186 +0100
|
||||
+++ converter/ppm/ppmtoilbm.c 2013-11-27 09:12:01.499668282 +0100
|
||||
--- converter/ppm/ppmtoilbm.c.orig 2014-04-01 11:09:00.997376226 +0200
|
||||
+++ converter/ppm/ppmtoilbm.c 2014-04-01 11:11:56.249523968 +0200
|
||||
@@ -185,6 +185,7 @@
|
||||
unsigned int i;
|
||||
int * table;
|
||||
@ -813,8 +813,8 @@ Index: converter/ppm/ppmtoilbm.c
|
||||
switch (mode) {
|
||||
Index: converter/ppm/ppmtolj.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtolj.c.orig 2013-11-27 08:57:05.047918210 +0100
|
||||
+++ converter/ppm/ppmtolj.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtolj.c.orig 2014-04-01 11:09:01.001376275 +0200
|
||||
+++ converter/ppm/ppmtolj.c 2014-04-01 11:11:56.249523968 +0200
|
||||
@@ -181,7 +181,8 @@
|
||||
|
||||
ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
|
||||
@ -827,8 +827,8 @@ Index: converter/ppm/ppmtolj.c
|
||||
if (mode == C_TRANS_MODE_DELTA)
|
||||
Index: converter/ppm/ppmtomitsu.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtomitsu.c.orig 2013-11-27 08:57:06.621937083 +0100
|
||||
+++ converter/ppm/ppmtomitsu.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtomitsu.c.orig 2014-04-01 11:09:01.839386548 +0200
|
||||
+++ converter/ppm/ppmtomitsu.c 2014-04-01 11:11:56.249523968 +0200
|
||||
@@ -685,6 +685,8 @@
|
||||
medias = MSize_User;
|
||||
|
||||
@ -840,8 +840,8 @@ Index: converter/ppm/ppmtomitsu.c
|
||||
}
|
||||
Index: converter/ppm/ppmtopcx.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtopcx.c.orig 2013-11-27 08:57:06.322933498 +0100
|
||||
+++ converter/ppm/ppmtopcx.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtopcx.c.orig 2014-04-01 11:09:01.676384550 +0200
|
||||
+++ converter/ppm/ppmtopcx.c 2014-04-01 11:11:56.250523980 +0200
|
||||
@@ -419,6 +419,8 @@
|
||||
else Planes = 1;
|
||||
}
|
||||
@ -853,8 +853,8 @@ Index: converter/ppm/ppmtopcx.c
|
||||
MALLOCARRAY_NOFAIL(planesrow, BytesPerLine);
|
||||
Index: converter/ppm/ppmtopict.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtopict.c.orig 2013-11-27 08:57:05.047918210 +0100
|
||||
+++ converter/ppm/ppmtopict.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtopict.c.orig 2014-04-01 11:09:01.001376275 +0200
|
||||
+++ converter/ppm/ppmtopict.c 2014-04-01 11:11:56.250523980 +0200
|
||||
@@ -441,6 +441,8 @@
|
||||
putShort(stdout, 0); /* mode */
|
||||
|
||||
@ -866,8 +866,8 @@ Index: converter/ppm/ppmtopict.c
|
||||
oc += putRow(stdout, row, cols, pixels[row], packed);
|
||||
Index: converter/ppm/ppmtopj.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtopj.c.orig 2013-11-27 08:57:06.320933474 +0100
|
||||
+++ converter/ppm/ppmtopj.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtopj.c.orig 2014-04-01 11:09:01.674384526 +0200
|
||||
+++ converter/ppm/ppmtopj.c 2014-04-01 11:11:56.250523980 +0200
|
||||
@@ -179,6 +179,7 @@
|
||||
pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
|
||||
|
||||
@ -878,8 +878,8 @@ Index: converter/ppm/ppmtopj.c
|
||||
|
||||
Index: converter/ppm/ppmtopjxl.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtopjxl.c.orig 2013-11-27 08:57:06.627937155 +0100
|
||||
+++ converter/ppm/ppmtopjxl.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtopjxl.c.orig 2014-04-01 11:09:01.849386671 +0200
|
||||
+++ converter/ppm/ppmtopjxl.c 2014-04-01 11:11:56.250523980 +0200
|
||||
@@ -305,6 +305,8 @@
|
||||
pm_error("image too large; reduce with ppmscale");
|
||||
if (maxval > PCL_MAXVAL)
|
||||
@ -914,8 +914,8 @@ Index: converter/ppm/ppmtopjxl.c
|
||||
runcnt = (signed char *)malloc((unsigned)bpp);
|
||||
Index: converter/ppm/ppmtowinicon.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtowinicon.c.orig 2013-11-27 08:57:06.625937131 +0100
|
||||
+++ converter/ppm/ppmtowinicon.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtowinicon.c.orig 2014-04-01 11:09:01.844386610 +0200
|
||||
+++ converter/ppm/ppmtowinicon.c 2014-04-01 11:11:56.251523992 +0200
|
||||
@@ -12,6 +12,7 @@
|
||||
|
||||
#include <math.h>
|
||||
@ -961,8 +961,8 @@ Index: converter/ppm/ppmtowinicon.c
|
||||
if (verbose)
|
||||
Index: converter/ppm/ppmtoxpm.c
|
||||
===================================================================
|
||||
--- converter/ppm/ppmtoxpm.c.orig 2013-11-27 08:57:06.624937119 +0100
|
||||
+++ converter/ppm/ppmtoxpm.c 2013-11-27 09:07:09.528166804 +0100
|
||||
--- converter/ppm/ppmtoxpm.c.orig 2014-04-01 11:09:01.843386598 +0200
|
||||
+++ converter/ppm/ppmtoxpm.c 2014-04-01 11:11:56.251523992 +0200
|
||||
@@ -197,6 +197,7 @@
|
||||
unsigned int i;
|
||||
|
||||
@ -981,8 +981,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 2013-11-27 08:57:05.048918222 +0100
|
||||
+++ converter/ppm/qrttoppm.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- converter/ppm/qrttoppm.c.orig 2014-04-01 11:09:01.002376287 +0200
|
||||
+++ converter/ppm/qrttoppm.c 2014-04-01 11:11:56.251523992 +0200
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
ppm_writeppminit( stdout, cols, rows, maxval, 0 );
|
||||
@ -994,8 +994,8 @@ Index: converter/ppm/qrttoppm.c
|
||||
|
||||
Index: converter/ppm/sldtoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/sldtoppm.c.orig 2013-11-27 08:57:06.623937107 +0100
|
||||
+++ converter/ppm/sldtoppm.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- converter/ppm/sldtoppm.c.orig 2014-04-01 11:09:01.841386573 +0200
|
||||
+++ converter/ppm/sldtoppm.c 2014-04-01 11:11:56.251523992 +0200
|
||||
@@ -464,6 +464,8 @@
|
||||
|
||||
/* Allocate image buffer and clear it to black. */
|
||||
@ -1007,8 +1007,8 @@ Index: converter/ppm/sldtoppm.c
|
||||
ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
|
||||
Index: converter/ppm/ximtoppm.c
|
||||
===================================================================
|
||||
--- converter/ppm/ximtoppm.c.orig 2013-11-27 08:57:06.624937119 +0100
|
||||
+++ converter/ppm/ximtoppm.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- converter/ppm/ximtoppm.c.orig 2014-04-01 11:09:01.842386586 +0200
|
||||
+++ converter/ppm/ximtoppm.c 2014-04-01 11:11:56.251523992 +0200
|
||||
@@ -117,6 +117,7 @@
|
||||
header->bits_channel = atoi(a_head.bits_per_channel);
|
||||
header->alpha_flag = atoi(a_head.alpha_channel);
|
||||
@ -1043,8 +1043,8 @@ Index: converter/ppm/ximtoppm.c
|
||||
if (header->colors == NULL) {
|
||||
Index: editor/pamcut.c
|
||||
===================================================================
|
||||
--- editor/pamcut.c.orig 2013-11-27 08:57:00.664865654 +0100
|
||||
+++ editor/pamcut.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pamcut.c.orig 2014-04-01 11:08:58.060340218 +0200
|
||||
+++ editor/pamcut.c 2014-04-01 11:11:56.252524004 +0200
|
||||
@@ -655,6 +655,8 @@
|
||||
|
||||
outpam = inpam; /* Initial value -- most fields should be same */
|
||||
@ -1056,8 +1056,8 @@ Index: editor/pamcut.c
|
||||
|
||||
Index: editor/pbmreduce.c
|
||||
===================================================================
|
||||
--- editor/pbmreduce.c.orig 2013-11-27 08:57:00.666865678 +0100
|
||||
+++ editor/pbmreduce.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pbmreduce.c.orig 2014-04-01 11:08:58.063340254 +0200
|
||||
+++ editor/pbmreduce.c 2014-04-01 11:11:56.252524004 +0200
|
||||
@@ -94,6 +94,7 @@
|
||||
if (halftone == QT_FS) {
|
||||
unsigned int col;
|
||||
@ -1068,8 +1068,8 @@ Index: editor/pbmreduce.c
|
||||
if (thiserr == NULL || nexterr == NULL)
|
||||
Index: editor/pnmgamma.c
|
||||
===================================================================
|
||||
--- editor/pnmgamma.c.orig 2013-11-27 08:57:01.053870318 +0100
|
||||
+++ editor/pnmgamma.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pnmgamma.c.orig 2014-04-01 11:08:58.276342866 +0200
|
||||
+++ editor/pnmgamma.c 2014-04-01 11:11:56.252524004 +0200
|
||||
@@ -586,6 +586,7 @@
|
||||
xelval ** const btableP) {
|
||||
|
||||
@ -1080,8 +1080,8 @@ Index: editor/pnmgamma.c
|
||||
MALLOCARRAY(*btableP, maxval+1);
|
||||
Index: editor/pnmhisteq.c
|
||||
===================================================================
|
||||
--- editor/pnmhisteq.c.orig 2013-11-27 08:57:00.666865678 +0100
|
||||
+++ editor/pnmhisteq.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pnmhisteq.c.orig 2014-04-01 11:08:58.064340267 +0200
|
||||
+++ editor/pnmhisteq.c 2014-04-01 11:11:56.252524004 +0200
|
||||
@@ -103,6 +103,7 @@
|
||||
unsigned int pixelCount;
|
||||
unsigned int * lumahist;
|
||||
@ -1092,8 +1092,8 @@ Index: editor/pnmhisteq.c
|
||||
pm_error("Out of storage allocating array for %u histogram elements",
|
||||
Index: editor/pnmindex.csh
|
||||
===================================================================
|
||||
--- editor/pnmindex.csh.orig 2013-11-27 09:07:09.512166613 +0100
|
||||
+++ editor/pnmindex.csh 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pnmindex.csh.orig 2014-04-01 11:11:56.228523711 +0200
|
||||
+++ editor/pnmindex.csh 2014-04-01 11:11:56.252524004 +0200
|
||||
@@ -1,5 +1,8 @@
|
||||
#!/bin/csh -f
|
||||
#
|
||||
@ -1105,8 +1105,8 @@ Index: editor/pnmindex.csh
|
||||
# Copyright (C) 1991 by Jef Poskanzer.
|
||||
Index: editor/pnmpad.c
|
||||
===================================================================
|
||||
--- editor/pnmpad.c.orig 2013-11-27 08:57:00.969869311 +0100
|
||||
+++ editor/pnmpad.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pnmpad.c.orig 2014-04-01 11:08:58.214342106 +0200
|
||||
+++ editor/pnmpad.c 2014-04-01 11:11:56.253524017 +0200
|
||||
@@ -527,6 +527,8 @@
|
||||
|
||||
computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
|
||||
@ -1118,8 +1118,8 @@ Index: editor/pnmpad.c
|
||||
if (PNM_FORMAT_TYPE(format) == PBM_TYPE)
|
||||
Index: editor/pnmremap.c
|
||||
===================================================================
|
||||
--- editor/pnmremap.c.orig 2013-11-27 08:57:00.664865654 +0100
|
||||
+++ editor/pnmremap.c 2013-11-27 09:07:09.529166816 +0100
|
||||
--- editor/pnmremap.c.orig 2014-04-01 11:08:58.059340205 +0200
|
||||
+++ editor/pnmremap.c 2014-04-01 11:11:56.253524017 +0200
|
||||
@@ -427,7 +427,7 @@
|
||||
unsigned int plane;
|
||||
|
||||
@ -1139,8 +1139,8 @@ Index: editor/pnmremap.c
|
||||
for (plane = 0; plane < pamP->depth; ++plane)
|
||||
Index: editor/pnmscalefixed.c
|
||||
===================================================================
|
||||
--- editor/pnmscalefixed.c.orig 2013-11-27 08:57:00.970869323 +0100
|
||||
+++ editor/pnmscalefixed.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- editor/pnmscalefixed.c.orig 2014-04-01 11:08:58.216342130 +0200
|
||||
+++ editor/pnmscalefixed.c 2014-04-01 11:11:56.253524017 +0200
|
||||
@@ -214,6 +214,8 @@
|
||||
const int rows, const int cols,
|
||||
int * newrowsP, int * newcolsP) {
|
||||
@ -1171,8 +1171,8 @@ Index: editor/pnmscalefixed.c
|
||||
|
||||
Index: editor/pnmshear.c
|
||||
===================================================================
|
||||
--- editor/pnmshear.c.orig 2013-11-27 08:57:00.667865690 +0100
|
||||
+++ editor/pnmshear.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- editor/pnmshear.c.orig 2014-04-01 11:08:58.065340279 +0200
|
||||
+++ editor/pnmshear.c 2014-04-01 11:11:56.253524017 +0200
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <assert.h>
|
||||
#include <math.h>
|
||||
@ -1180,8 +1180,8 @@ Index: editor/pnmshear.c
|
||||
+#include <limits.h>
|
||||
|
||||
#include "pm_c_util.h"
|
||||
#include "ppm.h"
|
||||
@@ -236,6 +237,11 @@
|
||||
#include "mallocvar.h"
|
||||
@@ -242,6 +243,11 @@
|
||||
|
||||
shearfac = fabs(tan(cmdline.angle));
|
||||
|
||||
@ -1195,8 +1195,8 @@ Index: editor/pnmshear.c
|
||||
pnm_writepnminit(stdout, newcols, rows, newmaxval, newformat, 0);
|
||||
Index: editor/ppmdither.c
|
||||
===================================================================
|
||||
--- editor/ppmdither.c.orig 2013-11-27 08:57:00.667865690 +0100
|
||||
+++ editor/ppmdither.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- editor/ppmdither.c.orig 2014-04-01 11:08:58.067340304 +0200
|
||||
+++ editor/ppmdither.c 2014-04-01 11:11:56.254524029 +0200
|
||||
@@ -355,7 +355,11 @@
|
||||
unsigned int const dithMatSize =
|
||||
(dithDim * sizeof(*dithMat)) + /* pointers */
|
||||
@ -1212,8 +1212,8 @@ Index: editor/ppmdither.c
|
||||
if (dithMat == NULL)
|
||||
Index: editor/specialty/pamoil.c
|
||||
===================================================================
|
||||
--- editor/specialty/pamoil.c.orig 2013-11-27 08:57:00.669865714 +0100
|
||||
+++ editor/specialty/pamoil.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- editor/specialty/pamoil.c.orig 2014-04-01 11:08:58.070340340 +0200
|
||||
+++ editor/specialty/pamoil.c 2014-04-01 11:11:56.254524029 +0200
|
||||
@@ -112,6 +112,7 @@
|
||||
tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
|
||||
pm_close(ifp);
|
||||
@ -1224,8 +1224,8 @@ Index: editor/specialty/pamoil.c
|
||||
pm_error("Unable to allocate memory for histogram.");
|
||||
Index: generator/pbmtext.c
|
||||
===================================================================
|
||||
--- generator/pbmtext.c.orig 2013-11-27 08:57:01.275872980 +0100
|
||||
+++ generator/pbmtext.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- generator/pbmtext.c.orig 2014-04-01 11:08:58.535346041 +0200
|
||||
+++ generator/pbmtext.c 2014-04-01 11:11:56.254524029 +0200
|
||||
@@ -96,12 +96,14 @@
|
||||
|
||||
for (i = 1; i < argc; ++i) {
|
||||
@ -1259,8 +1259,8 @@ Index: generator/pbmtext.c
|
||||
}
|
||||
Index: generator/pgmcrater.c
|
||||
===================================================================
|
||||
--- generator/pgmcrater.c.orig 2013-11-27 08:57:01.275872980 +0100
|
||||
+++ generator/pgmcrater.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- generator/pgmcrater.c.orig 2014-04-01 11:08:58.536346054 +0200
|
||||
+++ generator/pgmcrater.c 2014-04-01 11:11:56.254524029 +0200
|
||||
@@ -250,7 +250,7 @@
|
||||
/* Acquire the elevation array and initialize it to mean
|
||||
surface elevation. */
|
||||
@ -1272,21 +1272,20 @@ Index: generator/pgmcrater.c
|
||||
|
||||
Index: generator/pgmkernel.c
|
||||
===================================================================
|
||||
--- generator/pgmkernel.c.orig 2013-11-27 08:57:01.275872980 +0100
|
||||
+++ generator/pgmkernel.c 2013-11-27 09:07:09.530166828 +0100
|
||||
@@ -68,7 +68,7 @@
|
||||
kycenter = (fysize - 1) / 2.0;
|
||||
ixsize = fxsize + 0.999;
|
||||
iysize = fysize + 0.999;
|
||||
- MALLOCARRAY(fkernel, ixsize * iysize);
|
||||
+ fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double));
|
||||
for (i = 0; i < iysize; i++)
|
||||
for (j = 0; j < ixsize; j++) {
|
||||
fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double)
|
||||
--- generator/pgmkernel.c.orig 2014-04-01 11:11:56.255524041 +0200
|
||||
+++ generator/pgmkernel.c 2014-04-01 11:15:52.877427867 +0200
|
||||
@@ -214,6 +214,7 @@
|
||||
|
||||
/* Output matrix is symmetric vertically and horizontally. */
|
||||
|
||||
+ overflow_add(cmdline.rows, 1);
|
||||
arows = (cmdline.rows + 1) / 2;
|
||||
/* Half the number of rows. Add 1 if odd. */
|
||||
halfKernel = pgm_allocarray(cmdline.cols, arows);
|
||||
Index: lib/libpam.c
|
||||
===================================================================
|
||||
--- lib/libpam.c.orig 2013-11-27 08:57:02.152883497 +0100
|
||||
+++ lib/libpam.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- lib/libpam.c.orig 2014-04-01 11:08:59.184353998 +0200
|
||||
+++ lib/libpam.c 2014-04-01 11:11:56.255524041 +0200
|
||||
@@ -223,7 +223,8 @@
|
||||
unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
|
||||
tuple * tuplerow;
|
||||
@ -1299,8 +1298,8 @@ Index: lib/libpam.c
|
||||
/* Now we initialize the pointers to the individual tuples
|
||||
Index: lib/libpammap.c
|
||||
===================================================================
|
||||
--- lib/libpammap.c.orig 2013-11-27 08:57:02.152883497 +0100
|
||||
+++ lib/libpammap.c 2013-11-27 09:07:09.530166828 +0100
|
||||
--- lib/libpammap.c.orig 2014-04-01 11:08:59.183353986 +0200
|
||||
+++ lib/libpammap.c 2014-04-01 11:11:56.255524041 +0200
|
||||
@@ -107,6 +107,8 @@
|
||||
*/
|
||||
struct tupleint_list_item * retval;
|
||||
@ -1312,8 +1311,8 @@ Index: lib/libpammap.c
|
||||
+ pamP->depth * sizeof(sample);
|
||||
Index: lib/libpbm1.c
|
||||
===================================================================
|
||||
--- lib/libpbm1.c.orig 2013-11-27 08:57:02.155883532 +0100
|
||||
+++ lib/libpbm1.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- lib/libpbm1.c.orig 2014-04-01 11:08:59.190354072 +0200
|
||||
+++ lib/libpbm1.c 2014-04-01 11:11:56.256524054 +0200
|
||||
@@ -78,6 +78,7 @@
|
||||
} else {
|
||||
pm_filepos const bytesPerRow = (cols+7)/8;
|
||||
@ -1324,8 +1323,8 @@ Index: lib/libpbm1.c
|
||||
}
|
||||
Index: lib/libpm.c
|
||||
===================================================================
|
||||
--- lib/libpm.c.orig 2013-11-27 09:07:09.503166504 +0100
|
||||
+++ lib/libpm.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- lib/libpm.c.orig 2014-04-01 11:11:56.219523600 +0200
|
||||
+++ lib/libpm.c 2014-04-01 11:11:56.256524054 +0200
|
||||
@@ -807,4 +807,53 @@
|
||||
}
|
||||
|
||||
@ -1382,8 +1381,8 @@ Index: lib/libpm.c
|
||||
|
||||
Index: lib/pm.h
|
||||
===================================================================
|
||||
--- lib/pm.h.orig 2013-11-27 08:57:02.154883520 +0100
|
||||
+++ lib/pm.h 2013-11-27 09:07:09.531166840 +0100
|
||||
--- lib/pm.h.orig 2014-04-01 11:08:59.188354047 +0200
|
||||
+++ lib/pm.h 2014-04-01 11:11:56.256524054 +0200
|
||||
@@ -432,4 +432,11 @@
|
||||
#endif
|
||||
|
||||
@ -1398,8 +1397,8 @@ Index: lib/pm.h
|
||||
#endif
|
||||
Index: other/pnmcolormap.c
|
||||
===================================================================
|
||||
--- other/pnmcolormap.c.orig 2013-11-27 08:57:00.023857968 +0100
|
||||
+++ other/pnmcolormap.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- other/pnmcolormap.c.orig 2014-04-01 11:08:57.470332985 +0200
|
||||
+++ other/pnmcolormap.c 2014-04-01 11:11:56.256524054 +0200
|
||||
@@ -840,6 +840,7 @@
|
||||
pamP->width = intsqrt;
|
||||
else
|
||||
@ -1410,8 +1409,8 @@ Index: other/pnmcolormap.c
|
||||
unsigned int const intQuotient = colormap.size / pamP->width;
|
||||
Index: urt/README
|
||||
===================================================================
|
||||
--- urt/README.orig 2013-11-27 08:57:07.351945824 +0100
|
||||
+++ urt/README 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/README.orig 2014-04-01 11:09:02.144390288 +0200
|
||||
+++ urt/README 2014-04-01 11:11:56.256524054 +0200
|
||||
@@ -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 +1422,8 @@ Index: urt/README
|
||||
+Alan Cox <alan@redhat.com>
|
||||
Index: urt/rle_addhist.c
|
||||
===================================================================
|
||||
--- urt/rle_addhist.c.orig 2013-11-27 08:57:07.352945847 +0100
|
||||
+++ urt/rle_addhist.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/rle_addhist.c.orig 2014-04-01 11:09:02.146390312 +0200
|
||||
+++ urt/rle_addhist.c 2014-04-01 11:11:56.257524066 +0200
|
||||
@@ -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 +1470,8 @@ Index: urt/rle_addhist.c
|
||||
MALLOCARRAY(newc, length);
|
||||
Index: urt/rle_getrow.c
|
||||
===================================================================
|
||||
--- urt/rle_getrow.c.orig 2013-11-27 08:57:07.351945824 +0100
|
||||
+++ urt/rle_getrow.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/rle_getrow.c.orig 2014-04-01 11:09:02.144390288 +0200
|
||||
+++ urt/rle_getrow.c 2014-04-01 11:11:56.257524066 +0200
|
||||
@@ -17,6 +17,8 @@
|
||||
*
|
||||
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
|
||||
@ -1492,8 +1491,8 @@ Index: urt/rle_getrow.c
|
||||
{
|
||||
Index: urt/rle_hdr.c
|
||||
===================================================================
|
||||
--- urt/rle_hdr.c.orig 2013-11-27 08:57:07.352945847 +0100
|
||||
+++ urt/rle_hdr.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/rle_hdr.c.orig 2014-04-01 11:09:02.145390300 +0200
|
||||
+++ urt/rle_hdr.c 2014-04-01 11:11:56.257524066 +0200
|
||||
@@ -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 +1561,8 @@ Index: urt/rle_hdr.c
|
||||
RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" );
|
||||
Index: urt/rle.h
|
||||
===================================================================
|
||||
--- urt/rle.h.orig 2013-11-27 08:57:07.352945847 +0100
|
||||
+++ urt/rle.h 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/rle.h.orig 2014-04-01 11:09:02.146390312 +0200
|
||||
+++ urt/rle.h 2014-04-01 11:11:56.257524066 +0200
|
||||
@@ -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 +1593,8 @@ Index: urt/rle.h
|
||||
|
||||
Index: urt/rle_open_f.c
|
||||
===================================================================
|
||||
--- urt/rle_open_f.c.orig 2013-11-27 08:57:07.351945824 +0100
|
||||
+++ urt/rle_open_f.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/rle_open_f.c.orig 2014-04-01 11:09:02.143390276 +0200
|
||||
+++ urt/rle_open_f.c 2014-04-01 11:11:56.258524078 +0200
|
||||
@@ -163,65 +163,7 @@
|
||||
FILE ** const fpP,
|
||||
bool * const noSubprocessP,
|
||||
@ -1664,8 +1663,8 @@ Index: urt/rle_open_f.c
|
||||
|
||||
Index: urt/rle_putcom.c
|
||||
===================================================================
|
||||
--- urt/rle_putcom.c.orig 2013-11-27 08:57:07.351945824 +0100
|
||||
+++ urt/rle_putcom.c 2013-11-27 09:07:09.531166840 +0100
|
||||
--- urt/rle_putcom.c.orig 2014-04-01 11:09:02.143390276 +0200
|
||||
+++ urt/rle_putcom.c 2014-04-01 11:11:56.258524078 +0200
|
||||
@@ -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 +1692,8 @@ Index: urt/rle_putcom.c
|
||||
* comments block. Of course, if this were true, then the
|
||||
Index: urt/Runput.c
|
||||
===================================================================
|
||||
--- urt/Runput.c.orig 2013-11-27 08:57:07.353945864 +0100
|
||||
+++ urt/Runput.c 2013-11-27 09:07:09.532166852 +0100
|
||||
--- urt/Runput.c.orig 2014-04-01 11:09:02.147390325 +0200
|
||||
+++ urt/Runput.c 2014-04-01 11:11:56.258524078 +0200
|
||||
@@ -17,6 +17,8 @@
|
||||
*
|
||||
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
|
||||
@ -1729,8 +1728,8 @@ Index: urt/Runput.c
|
||||
fprintf( stderr,
|
||||
Index: urt/scanargs.c
|
||||
===================================================================
|
||||
--- urt/scanargs.c.orig 2013-11-27 08:57:07.350945802 +0100
|
||||
+++ urt/scanargs.c 2013-11-27 09:07:09.532166852 +0100
|
||||
--- urt/scanargs.c.orig 2014-04-01 11:09:02.142390263 +0200
|
||||
+++ urt/scanargs.c 2014-04-01 11:11:56.258524078 +0200
|
||||
@@ -38,6 +38,8 @@
|
||||
*
|
||||
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: netpbm-10.63.1/converter/other/anytopnm
|
||||
Index: converter/other/anytopnm
|
||||
===================================================================
|
||||
--- netpbm-10.63.1.orig/converter/other/anytopnm
|
||||
+++ netpbm-10.63.1/converter/other/anytopnm
|
||||
@@ -511,10 +511,7 @@ else
|
||||
--- converter/other/anytopnm.orig 2014-04-01 11:09:00.723372866 +0200
|
||||
+++ converter/other/anytopnm 2014-04-01 11:19:32.032102323 +0200
|
||||
@@ -511,10 +511,7 @@
|
||||
inputFile="-"
|
||||
fi
|
||||
|
||||
@ -14,7 +14,7 @@ Index: netpbm-10.63.1/converter/other/anytopnm
|
||||
|
||||
# Take out all spaces
|
||||
# Find the filename extension for last-ditch efforts later
|
||||
@@ -540,9 +537,17 @@ if [ "$filetype" = "unknown" ]; then
|
||||
@@ -540,9 +537,17 @@
|
||||
echo "$progname: unknown file type. " \
|
||||
"'file' says mime type is '$mimeType', " 1>&2
|
||||
echo "type description is '$typeDescription'" 1>&2
|
||||
@ -32,11 +32,11 @@ Index: netpbm-10.63.1/converter/other/anytopnm
|
||||
+fi
|
||||
+
|
||||
exit 0
|
||||
Index: netpbm-10.63.1/editor/pamstretch-gen
|
||||
Index: editor/pamstretch-gen
|
||||
===================================================================
|
||||
--- netpbm-10.63.1.orig/editor/pamstretch-gen
|
||||
+++ netpbm-10.63.1/editor/pamstretch-gen
|
||||
@@ -31,13 +31,9 @@ if [ "$1" = "" ]; then
|
||||
--- editor/pamstretch-gen.orig 2014-04-01 11:08:58.068340316 +0200
|
||||
+++ editor/pamstretch-gen 2014-04-01 11:19:32.033102335 +0200
|
||||
@@ -31,13 +31,9 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -51,10 +51,10 @@ Index: netpbm-10.63.1/editor/pamstretch-gen
|
||||
if ! cat $2 >$tempfile 2>/dev/null; then
|
||||
echo 'pamstretch-gen: error reading file' 1>&2
|
||||
exit 1
|
||||
Index: netpbm-10.63.1/editor/pnmmargin
|
||||
Index: editor/pnmmargin
|
||||
===================================================================
|
||||
--- netpbm-10.63.1.orig/editor/pnmmargin
|
||||
+++ netpbm-10.63.1/editor/pnmmargin
|
||||
--- editor/pnmmargin.orig 2014-04-01 11:08:58.058340193 +0200
|
||||
+++ editor/pnmmargin 2014-04-01 11:20:28.990798746 +0200
|
||||
@@ -11,15 +11,11 @@
|
||||
# documentation. This software is provided "as is" without express or
|
||||
# implied warranty.
|
||||
@ -76,7 +76,7 @@ Index: netpbm-10.63.1/editor/pnmmargin
|
||||
|
||||
color="-gofigure"
|
||||
plainopt=""
|
||||
@@ -90,6 +86,7 @@ else
|
||||
@@ -90,6 +86,7 @@
|
||||
-white | -black )
|
||||
pnmpad $plainopt $color \
|
||||
-left=$size -right=$size -top=$size -bottom=$size $tmp1
|
||||
@ -84,20 +84,17 @@ Index: netpbm-10.63.1/editor/pnmmargin
|
||||
exit
|
||||
;;
|
||||
* )
|
||||
@@ -102,7 +99,4 @@ else
|
||||
pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4
|
||||
@@ -103,4 +100,4 @@
|
||||
pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3
|
||||
fi
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
+rm -rf "$tmpdir"
|
||||
Index: netpbm-10.63.1/editor/ppmfade
|
||||
+rm -rf "$tmpdir
|
||||
Index: editor/ppmfade
|
||||
===================================================================
|
||||
--- netpbm-10.63.1.orig/editor/ppmfade
|
||||
+++ netpbm-10.63.1/editor/ppmfade
|
||||
@@ -40,6 +40,7 @@ exec perl -w -x -S -- "$0" "$@"
|
||||
--- editor/ppmfade.orig 2014-04-01 11:08:58.218342155 +0200
|
||||
+++ editor/ppmfade 2014-04-01 11:19:32.033102335 +0200
|
||||
@@ -40,6 +40,7 @@
|
||||
#
|
||||
##############################################################################
|
||||
use strict;
|
||||
@ -105,7 +102,7 @@ Index: netpbm-10.63.1/editor/ppmfade
|
||||
|
||||
my $SPREAD = 1;
|
||||
my $SHIFT = 2;
|
||||
@@ -137,20 +138,26 @@ if ($first_file ne "undefined") {
|
||||
@@ -137,20 +138,26 @@
|
||||
|
||||
print("Frames are " . $width . "W x " . $height . "H\n");
|
||||
|
||||
@ -136,7 +133,7 @@ Index: netpbm-10.63.1/editor/ppmfade
|
||||
}
|
||||
|
||||
#
|
||||
@@ -158,14 +165,14 @@ if ($last_file eq "undefined") {
|
||||
@@ -158,14 +165,14 @@
|
||||
#
|
||||
|
||||
# Here's what our temporary files are:
|
||||
@ -159,7 +156,7 @@ Index: netpbm-10.63.1/editor/ppmfade
|
||||
|
||||
my $i; # Frame number
|
||||
for ($i = 1; $i <= $nframes; $i++) {
|
||||
@@ -173,147 +180,147 @@ for ($i = 1; $i <= $nframes; $i++) {
|
||||
@@ -173,147 +180,147 @@
|
||||
if ($mode eq $SPREAD) {
|
||||
if ($i <= 10) {
|
||||
my $n = $spline20[$i] * 100;
|
||||
@ -360,11 +357,11 @@ Index: netpbm-10.63.1/editor/ppmfade
|
||||
+system("rm $tmpdir/junk*$$.ppm");
|
||||
|
||||
exit(0);
|
||||
Index: netpbm-10.63.1/editor/ppmshadow
|
||||
Index: editor/ppmshadow
|
||||
===================================================================
|
||||
--- netpbm-10.63.1.orig/editor/ppmshadow
|
||||
+++ netpbm-10.63.1/editor/ppmshadow
|
||||
@@ -97,9 +97,10 @@ sub makeConvolutionKernel($$) {
|
||||
--- editor/ppmshadow.orig 2014-04-01 11:08:58.066340291 +0200
|
||||
+++ editor/ppmshadow 2014-04-01 11:19:32.034102347 +0200
|
||||
@@ -97,9 +97,10 @@
|
||||
|
||||
|
||||
my $tmpdir = $ENV{TMPDIR} || "/tmp";
|
||||
|
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 1 11:25:10 UTC 2014 - pgajdos@suse.com
|
||||
|
||||
- updated to 10.66.00
|
||||
* Add pamvalidate.
|
||||
* Add pamfix: Does what pamfixtrunc did, plus repairs excessive
|
||||
sample values.
|
||||
* pgmramp: add -diagonal.
|
||||
* libnetpbm: Read functions validate that sample values do not
|
||||
exceed maxval.
|
||||
* etc. see HISTORY for details
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 27 08:36:15 UTC 2013 - pgajdos@suse.com
|
||||
|
||||
|
14
netpbm.spec
14
netpbm.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package netpbm
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
|
||||
%define libmaj 11
|
||||
%define libmin 64
|
||||
%define libmin 66
|
||||
%define libver %{libmaj}.%{libmin}
|
||||
|
||||
Name: netpbm
|
||||
Version: 10.64.4
|
||||
Version: 10.66.0
|
||||
Release: 0
|
||||
Summary: A Powerful Graphics Conversion Package
|
||||
License: BSD-3-Clause and GPL-2.0+ and SUSE-IJG and MIT and SUSE-Public-Domain
|
||||
@ -111,13 +111,19 @@ source package.
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch5
|
||||
mkdir pnmtopalm # for %%doc pnmtopalm
|
||||
cp -p converter/other/pnmtopalm/{LICENSE,README} pnmtopalm
|
||||
|
||||
%build
|
||||
# netpbm has _interactive_ configure perl script
|
||||
cp config.mk.in config.mk # recomended by upstream, see doc/INSTALL
|
||||
sed -i "s:STATICLIB_TOO = y:STATICLIB_TOO = n:" config.mk
|
||||
# following two added 10.66.0, reported upstream
|
||||
# recipe for target 'converter/install.manweb' failed
|
||||
echo 'install.manweb:' >> converter/ppm/hpcdtoppm/Makefile
|
||||
# dtto for ppmtompeg
|
||||
echo 'install.manweb:' >> converter/ppm/ppmtompeg/Makefile
|
||||
export CFLAGS="$RPM_OPT_FLAGS -flax-vector-conversions"
|
||||
make CFLAGS="$CFLAGS"
|
||||
rm doc/INSTALL
|
||||
|
Loading…
Reference in New Issue
Block a user