|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: netpbm-10.93.0/analyzer/pgmtexture.c
|
|
|
|
|
Index: netpbm-10.96.4/analyzer/pgmtexture.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/analyzer/pgmtexture.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/analyzer/pgmtexture.c 2020-12-29 11:04:36.008969144 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/analyzer/pgmtexture.c 2021-12-13 13:12:01.856665397 +0100
|
|
|
|
|
+++ netpbm-10.96.4/analyzer/pgmtexture.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -53,7 +53,7 @@ vector(unsigned int const nl,
|
|
|
|
|
float * v;
|
|
|
|
|
|
|
|
|
@ -28,10 +28,10 @@ Index: netpbm-10.93.0/analyzer/pgmtexture.c
|
|
|
|
|
/* allocate rows and set pointers to them */
|
|
|
|
|
for (i = nrl; i <= nrh; ++i) {
|
|
|
|
|
MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1));
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/gemtopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/gemtopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/gemtopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/gemtopnm.c 2020-12-29 11:04:36.008969144 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/gemtopnm.c 2021-12-13 13:11:49.684590746 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/gemtopnm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -105,7 +105,7 @@ main(argc, argv)
|
|
|
|
|
type = PPM_TYPE;
|
|
|
|
|
|
|
|
|
@ -41,10 +41,10 @@ Index: netpbm-10.93.0/converter/other/gemtopnm.c
|
|
|
|
|
{
|
|
|
|
|
/* allocate input row data structure */
|
|
|
|
|
int plane;
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/jpegtopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/jpegtopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/jpegtopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/jpegtopnm.c 2020-12-29 11:04:36.008969144 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/jpegtopnm.c 2021-12-13 13:11:51.248600341 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/jpegtopnm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -862,6 +862,8 @@ convertImage(FILE *
|
|
|
|
|
/* Calculate output image dimensions so we can allocate space */
|
|
|
|
|
jpeg_calc_output_dimensions(cinfoP);
|
|
|
|
@ -54,10 +54,10 @@ Index: netpbm-10.93.0/converter/other/jpegtopnm.c
|
|
|
|
|
/* Start decompressor */
|
|
|
|
|
jpeg_start_decompress(cinfoP);
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/pbmtopgm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/pbmtopgm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/pbmtopgm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/pbmtopgm.c 2020-12-29 11:04:36.008969144 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/pbmtopgm.c 2021-12-13 13:11:50.244594183 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/pbmtopgm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -60,6 +60,7 @@ main(int argc, char *argv[]) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -66,10 +66,10 @@ Index: netpbm-10.93.0/converter/other/pbmtopgm.c
|
|
|
|
|
maxval = MIN(PGM_OVERALLMAXVAL, width*height);
|
|
|
|
|
pgm_writepgminit(stdout, cols, rows, maxval, 0) ;
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/pnmtoddif.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/pnmtoddif.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/pnmtoddif.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/pnmtoddif.c 2020-12-29 11:04:36.008969144 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/pnmtoddif.c 2021-12-13 13:11:50.244594183 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/pnmtoddif.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -629,6 +629,7 @@ main(int argc, char *argv[]) {
|
|
|
|
|
switch (PNM_FORMAT_TYPE(format)) {
|
|
|
|
|
case PBM_TYPE:
|
|
|
|
@ -86,10 +86,10 @@ Index: netpbm-10.93.0/converter/other/pnmtoddif.c
|
|
|
|
|
ip.bytes_per_line = 3 * cols;
|
|
|
|
|
ip.bits_per_pixel = 24;
|
|
|
|
|
ip.spectral = 5;
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/pnmtojpeg.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/pnmtojpeg.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/pnmtojpeg.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/pnmtojpeg.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/pnmtojpeg.c 2021-12-13 13:11:50.244594183 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/pnmtojpeg.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -606,7 +606,11 @@ read_scan_script(j_compress_ptr const ci
|
|
|
|
|
want JPOOL_PERMANENT.
|
|
|
|
|
*/
|
|
|
|
@ -120,10 +120,10 @@ Index: netpbm-10.93.0/converter/other/pnmtojpeg.c
|
|
|
|
|
buffer = (*cinfo_p->mem->alloc_sarray)
|
|
|
|
|
((j_common_ptr) cinfo_p, JPOOL_IMAGE,
|
|
|
|
|
(unsigned int) cinfo_p->image_width * cinfo_p->input_components,
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/pnmtops.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/pnmtops.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/pnmtops.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/pnmtops.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/pnmtops.c 2021-12-13 13:11:48.824585472 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/pnmtops.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -294,17 +294,21 @@ parseCommandLine(int argc, const char **
|
|
|
|
|
validateCompDimension(width, 72, "-width value");
|
|
|
|
|
validateCompDimension(height, 72, "-height value");
|
|
|
|
@ -147,10 +147,10 @@ Index: netpbm-10.93.0/converter/other/pnmtops.c
|
|
|
|
|
cmdlineP->imageheight = imageheight * 72;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/pnmtorle.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/pnmtorle.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/pnmtorle.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/pnmtorle.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/pnmtorle.c 2021-12-13 13:11:50.248594206 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/pnmtorle.c 2021-12-13 13:17:36.810714143 +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,
|
|
|
|
@ -160,10 +160,10 @@ Index: netpbm-10.93.0/converter/other/pnmtorle.c
|
|
|
|
|
*/
|
|
|
|
|
/*
|
|
|
|
|
* pnmtorle - A program which will convert pbmplus (ppm or pgm) images
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/pnmtosgi.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/pnmtosgi.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/pnmtosgi.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/pnmtosgi.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/pnmtosgi.c 2021-12-13 13:11:50.252594232 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/pnmtosgi.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -185,6 +185,7 @@ buildChannels(FILE * const ifP,
|
|
|
|
|
ScanElem * temp;
|
|
|
|
|
|
|
|
|
@ -172,10 +172,10 @@ Index: netpbm-10.93.0/converter/other/pnmtosgi.c
|
|
|
|
|
MALLOCARRAY_NOFAIL(table, channels * rows);
|
|
|
|
|
} else
|
|
|
|
|
table = NULL;
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/rletopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/rletopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/rletopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/rletopnm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/rletopnm.c 2021-12-13 13:11:51.244600317 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/rletopnm.c 2021-12-13 13:17:36.810714143 +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,
|
|
|
|
@ -185,10 +185,10 @@ Index: netpbm-10.93.0/converter/other/rletopnm.c
|
|
|
|
|
*/
|
|
|
|
|
/*
|
|
|
|
|
* rletopnm - A conversion program to convert from Utah's "rle" image format
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/sgitopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/sgitopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/sgitopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/sgitopnm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/sgitopnm.c 2021-12-13 13:11:51.244600317 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/sgitopnm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -377,10 +377,14 @@ readChannels(FILE * const ifP,
|
|
|
|
|
MALLOCARRAY_NOFAIL(image, head->ysize);
|
|
|
|
|
} else {
|
|
|
|
@ -205,10 +205,10 @@ Index: netpbm-10.93.0/converter/other/sgitopnm.c
|
|
|
|
|
|
|
|
|
|
for (channel = 0; channel < maxchannel; ++channel) {
|
|
|
|
|
unsigned int row;
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/sirtopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/sirtopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/sirtopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/sirtopnm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/sirtopnm.c 2021-12-13 13:11:51.272600489 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/sirtopnm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -69,6 +69,7 @@ char* argv[];
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
@ -217,10 +217,10 @@ Index: netpbm-10.93.0/converter/other/sirtopnm.c
|
|
|
|
|
picsize = cols * rows * 3;
|
|
|
|
|
planesize = cols * rows;
|
|
|
|
|
if ( !( sirarray = (unsigned char*) malloc( picsize ) ) )
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/tifftopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/tifftopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/tifftopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/tifftopnm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/tifftopnm.c 2021-12-13 13:11:50.744597250 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/tifftopnm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -1372,7 +1372,9 @@ convertRasterByRows(pnmOut * const
|
|
|
|
|
if (scanbuf == NULL)
|
|
|
|
|
pm_error("can't allocate memory for scanline buffer");
|
|
|
|
@ -232,10 +232,10 @@ Index: netpbm-10.93.0/converter/other/tifftopnm.c
|
|
|
|
|
if (samplebuf == NULL)
|
|
|
|
|
pm_error("can't allocate memory for row buffer");
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/other/xwdtopnm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/other/xwdtopnm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/other/xwdtopnm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/other/xwdtopnm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/other/xwdtopnm.c 2021-12-13 13:11:49.684590746 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/other/xwdtopnm.c 2021-12-13 13:17:36.810714143 +0100
|
|
|
|
|
@@ -210,6 +210,10 @@ processX10Header(X10WDFileHeader * cons
|
|
|
|
|
*colorsP = pnm_allocrow(2);
|
|
|
|
|
PNM_ASSIGN1((*colorsP)[0], 0);
|
|
|
|
@ -255,10 +255,10 @@ Index: netpbm-10.93.0/converter/other/xwdtopnm.c
|
|
|
|
|
*padrightP =
|
|
|
|
|
h11FixedP->bytes_per_line * 8 -
|
|
|
|
|
h11FixedP->pixmap_width * h11FixedP->bits_per_pixel;
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/mdatopbm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/mdatopbm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/mdatopbm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/mdatopbm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/mdatopbm.c 2021-12-13 13:11:51.256600390 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/mdatopbm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -245,10 +245,13 @@ main(int argc, char **argv) {
|
|
|
|
|
pm_readlittleshort(infile, &yy); nInCols = yy;
|
|
|
|
|
}
|
|
|
|
@ -274,23 +274,23 @@ Index: netpbm-10.93.0/converter/pbm/mdatopbm.c
|
|
|
|
|
|
|
|
|
|
data = pbm_allocarray(nOutCols, nOutRows);
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/mgrtopbm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/mgrtopbm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/mgrtopbm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/mgrtopbm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
@@ -65,6 +65,8 @@ readMgrHeader(FILE * const ifP,
|
|
|
|
|
if (head.h_high < ' ' || head.l_high < ' ')
|
|
|
|
|
pm_error("Invalid width field in MGR header");
|
|
|
|
|
|
|
|
|
|
+ overflow_add(*colsP, pad);
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/mgrtopbm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/mgrtopbm.c 2021-12-13 13:22:52.624641835 +0100
|
|
|
|
|
@@ -104,6 +104,8 @@ readMgrHeader(FILE * const ifP,
|
|
|
|
|
|
|
|
|
|
interpHdrWidth (head, colsP);
|
|
|
|
|
interpHdrHeight(head, rowsP);
|
|
|
|
|
+
|
|
|
|
|
*colsP = (((int)head.h_wide - ' ') << 6) + ((int)head.l_wide - ' ');
|
|
|
|
|
*rowsP = (((int)head.h_high - ' ') << 6) + ((int) head.l_high - ' ');
|
|
|
|
|
+ overflow_add(*colsP, pad);
|
|
|
|
|
|
|
|
|
|
*padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP;
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtogem.c
|
|
|
|
|
}
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtogem.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtogem.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtogem.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtogem.c 2021-12-13 13:11:51.256600390 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtogem.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -79,6 +79,7 @@ putinit (int const rows, int const cols)
|
|
|
|
|
bitsperitem = 0;
|
|
|
|
|
bitshift = 7;
|
|
|
|
@ -299,10 +299,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtogem.c
|
|
|
|
|
outmax = (cols + 7) / 8;
|
|
|
|
|
outrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
|
|
|
|
|
lastrow = (unsigned char *) pm_allocrow (outmax, sizeof (unsigned char));
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtogo.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtogo.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtogo.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtogo.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtogo.c 2021-12-13 13:11:51.340600906 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtogo.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -158,6 +158,7 @@ main(int argc,
|
|
|
|
|
bitrow = pbm_allocrow(cols);
|
|
|
|
|
|
|
|
|
@ -311,10 +311,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtogo.c
|
|
|
|
|
rucols = ( cols + 7 ) / 8;
|
|
|
|
|
bytesperrow = rucols; /* GraphOn uses bytes */
|
|
|
|
|
rucols = rucols * 8;
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtolj.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtolj.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtolj.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtolj.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtolj.c 2021-12-13 13:11:51.364601052 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtolj.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -120,7 +120,11 @@ parseCommandLine(int argc, char ** argv,
|
|
|
|
|
static void
|
|
|
|
|
allocateBuffers(unsigned int const cols) {
|
|
|
|
@ -327,10 +327,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtolj.c
|
|
|
|
|
packBufferSize = rowBufferSize + (rowBufferSize + 127) / 128 + 1;
|
|
|
|
|
deltaBufferSize = rowBufferSize + rowBufferSize / 8 + 10;
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtomda.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtomda.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtomda.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtomda.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtomda.c 2021-12-13 13:11:51.572602329 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtomda.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -179,6 +179,7 @@ int main(int argc, char **argv)
|
|
|
|
|
|
|
|
|
|
nOutRowsUnrounded = bScale ? nInRows/2 : nInRows;
|
|
|
|
@ -339,10 +339,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtomda.c
|
|
|
|
|
nOutRows = ((nOutRowsUnrounded + 3) / 4) * 4;
|
|
|
|
|
/* MDA wants rows a multiple of 4 */
|
|
|
|
|
nOutCols = nInCols / 8;
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtoppa/pbm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtoppa/pbm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtoppa/pbm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtoppa/pbm.c 2020-12-29 11:04:36.012969168 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtoppa/pbm.c 2021-12-13 13:11:51.264600439 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtoppa/pbm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -154,6 +154,7 @@ pbm_readline(pbm_stat * const pbmSt
|
|
|
|
|
break;
|
|
|
|
|
case P4: {
|
|
|
|
@ -359,10 +359,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtoppa/pbm.c
|
|
|
|
|
pbmStatP->revdata = malloc ((pbmStatP->width+7)/8);
|
|
|
|
|
memcpy(pbmStatP->revdata, data, (pbmStatP->width+7)/8);
|
|
|
|
|
--pbmStatP->current_line;
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtoppa/pbmtoppa.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtoppa/pbmtoppa.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtoppa/pbmtoppa.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtoppa/pbmtoppa.c 2020-12-29 11:04:36.088969637 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtoppa/pbmtoppa.c 2021-12-13 13:11:51.264600439 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtoppa/pbmtoppa.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -453,6 +453,7 @@ main(int argc, char *argv[]) {
|
|
|
|
|
pm_error("main(): unrecognized parameter '%s'", argv[argn]);
|
|
|
|
|
}
|
|
|
|
@ -371,10 +371,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtoppa/pbmtoppa.c
|
|
|
|
|
Pwidth=(Width+7)/8;
|
|
|
|
|
printer.fptr=out;
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmtoxbm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmtoxbm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmtoxbm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmtoxbm.c 2020-12-29 11:04:36.096969687 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmtoxbm.c 2021-12-13 13:11:51.368601078 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmtoxbm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -353,6 +353,8 @@ convertRaster(FILE * const ifP,
|
|
|
|
|
unsigned char * bitrow;
|
|
|
|
|
unsigned int row;
|
|
|
|
@ -384,10 +384,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmtoxbm.c
|
|
|
|
|
putinit(xbmVersion);
|
|
|
|
|
|
|
|
|
|
bitrow = pbm_allocrow_packed(cols + padright);
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pbmto4425.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pbmto4425.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pbmto4425.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pbmto4425.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pbmto4425.c 2021-12-13 13:11:51.552602205 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pbmto4425.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
|
|
|
|
#include "nstring.h"
|
|
|
|
@ -405,10 +405,10 @@ Index: netpbm-10.93.0/converter/pbm/pbmto4425.c
|
|
|
|
|
if(vmap == NULL)
|
|
|
|
|
{
|
|
|
|
|
pm_error( "Cannot allocate memory" );
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/pktopbm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/pktopbm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/pktopbm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/pktopbm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/pktopbm.c 2021-12-13 13:11:51.376601127 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/pktopbm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -280,6 +280,7 @@ main(int argc, char *argv[]) {
|
|
|
|
|
if (flagbyte == 7) { /* long form preamble */
|
|
|
|
|
integer packetlength = get32() ; /* character packet length */
|
|
|
|
@ -417,10 +417,10 @@ Index: netpbm-10.93.0/converter/pbm/pktopbm.c
|
|
|
|
|
endofpacket = packetlength + pktopbm_pkloc;
|
|
|
|
|
/* calculate end of packet */
|
|
|
|
|
if ((car >= MAXPKCHAR) || !filename[car]) {
|
|
|
|
|
Index: netpbm-10.93.0/converter/pbm/thinkjettopbm.l
|
|
|
|
|
Index: netpbm-10.96.4/converter/pbm/thinkjettopbm.l
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pbm/thinkjettopbm.l 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pbm/thinkjettopbm.l 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pbm/thinkjettopbm.l 2021-12-13 13:11:51.572602329 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pbm/thinkjettopbm.l 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -114,7 +114,9 @@ DIG [0-9]
|
|
|
|
|
<RASTERMODE>\033\*b{DIG}+W {
|
|
|
|
|
int l;
|
|
|
|
@ -440,10 +440,10 @@ Index: netpbm-10.93.0/converter/pbm/thinkjettopbm.l
|
|
|
|
|
pbm_writepbminit(stdout, maxRowLength*8, rowCount, 0);
|
|
|
|
|
|
|
|
|
|
packed_bitrow = malloc(maxRowLength);
|
|
|
|
|
Index: netpbm-10.93.0/converter/pgm/lispmtopgm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pgm/lispmtopgm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pgm/lispmtopgm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pgm/lispmtopgm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pgm/lispmtopgm.c 2021-12-13 13:11:54.848622422 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pgm/lispmtopgm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -58,6 +58,7 @@ main( argc, argv )
|
|
|
|
|
pm_error( "depth (%d bits) is too large", depth);
|
|
|
|
|
|
|
|
|
@ -463,10 +463,10 @@ Index: netpbm-10.93.0/converter/pgm/lispmtopgm.c
|
|
|
|
|
*padrightP = ( ( *colsP + 31 ) / 32 ) * 32 - *colsP;
|
|
|
|
|
|
|
|
|
|
if ( *colsP != (cols_32 - *padrightP) ) {
|
|
|
|
|
Index: netpbm-10.93.0/converter/pgm/psidtopgm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/pgm/psidtopgm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/pgm/psidtopgm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/pgm/psidtopgm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/pgm/psidtopgm.c 2021-12-13 13:11:54.852622445 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/pgm/psidtopgm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -78,6 +78,7 @@ main(int argc,
|
|
|
|
|
pm_error("bits/sample (%d) is too large.", bitspersample);
|
|
|
|
|
|
|
|
|
@ -475,10 +475,10 @@ Index: netpbm-10.93.0/converter/pgm/psidtopgm.c
|
|
|
|
|
grayrow = pgm_allocrow((cols + 7) / 8 * 8);
|
|
|
|
|
for (row = 0; row < rows; ++row) {
|
|
|
|
|
unsigned int col;
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ilbmtoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ilbmtoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ilbmtoppm.c 2020-12-29 11:04:16.004845981 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ilbmtoppm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ilbmtoppm.c 2021-12-13 13:11:54.080617711 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ilbmtoppm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -608,6 +608,7 @@ decode_row(FILE * const ifP,
|
|
|
|
|
rawtype *chp;
|
|
|
|
|
|
|
|
|
@ -550,10 +550,10 @@ Index: netpbm-10.93.0/converter/ppm/ilbmtoppm.c
|
|
|
|
|
MALLOCARRAY_NOFAIL(ilbmrow, RowBytes(bmhdP->w));
|
|
|
|
|
*viewportmodesP |= fakeviewport; /* -isham/-isehb */
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/imgtoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/imgtoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/imgtoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/imgtoppm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/imgtoppm.c 2021-12-13 13:11:54.844622398 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/imgtoppm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -84,6 +84,7 @@ main(int argc, char ** argv) {
|
|
|
|
|
len = atoi((char*) buf );
|
|
|
|
|
if ( fread( buf, len, 1, ifp ) != 1 )
|
|
|
|
@ -570,10 +570,10 @@ Index: netpbm-10.93.0/converter/ppm/imgtoppm.c
|
|
|
|
|
if ( len != cols * rows )
|
|
|
|
|
pm_message(
|
|
|
|
|
"pixel data length (%d) does not match image size (%d)",
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/Makefile
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/Makefile 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/Makefile 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/Makefile 2021-12-13 13:11:54.188618373 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/Makefile 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -11,7 +11,7 @@ SUBDIRS = hpcdtoppm ppmtompeg
|
|
|
|
|
|
|
|
|
|
PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
|
|
|
|
@ -583,10 +583,10 @@ Index: netpbm-10.93.0/converter/ppm/Makefile
|
|
|
|
|
ppmtoacad ppmtoapplevol ppmtoarbtxt ppmtoascii \
|
|
|
|
|
ppmtobmp ppmtoeyuv ppmtogif ppmtoicr ppmtoilbm \
|
|
|
|
|
ppmtoleaf ppmtolj ppmtomitsu ppmtoneo \
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/pcxtoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/pcxtoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/pcxtoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/pcxtoppm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/pcxtoppm.c 2021-12-13 13:11:54.856622471 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/pcxtoppm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -409,6 +409,7 @@ pcx_planes_to_pixels(pixels, bitplanes,
|
|
|
|
|
/*
|
|
|
|
|
* clear the pixel buffer
|
|
|
|
@ -603,20 +603,20 @@ Index: netpbm-10.93.0/converter/ppm/pcxtoppm.c
|
|
|
|
|
rawcols = BytesPerLine * 8 / BitsPerPixel;
|
|
|
|
|
if (headerCols > rawcols) {
|
|
|
|
|
pm_message("warning - BytesPerLine = %d, "
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/picttoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/picttoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/picttoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/picttoppm.c 2020-12-29 11:04:36.100969711 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/picttoppm.c 2021-12-13 13:11:51.740603358 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/picttoppm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -1,3 +1,5 @@
|
|
|
|
|
+#error "Unfixable. Don't ship me"
|
|
|
|
|
+
|
|
|
|
|
/*
|
|
|
|
|
* picttoppm.c -- convert a MacIntosh PICT file to PPM format.
|
|
|
|
|
*
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/pjtoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/pjtoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/pjtoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/pjtoppm.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/pjtoppm.c 2021-12-13 13:11:54.832622323 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/pjtoppm.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -168,14 +168,20 @@ main(int argc, const char ** argv) {
|
|
|
|
|
case 'V': /* send plane */
|
|
|
|
|
case 'W': /* send last plane */
|
|
|
|
@ -663,10 +663,10 @@ Index: netpbm-10.93.0/converter/ppm/pjtoppm.c
|
|
|
|
|
cols *= 8;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtoeyuv.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtoeyuv.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtoeyuv.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtoeyuv.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtoeyuv.c 2021-12-13 13:11:54.868622544 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtoeyuv.c 2021-12-13 13:17:36.814714167 +0100
|
|
|
|
|
@@ -114,6 +114,7 @@ create_multiplication_tables(const pixva
|
|
|
|
|
|
|
|
|
|
int index;
|
|
|
|
@ -675,10 +675,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtoeyuv.c
|
|
|
|
|
MALLOCARRAY_NOFAIL(mult299 , maxval+1);
|
|
|
|
|
MALLOCARRAY_NOFAIL(mult587 , maxval+1);
|
|
|
|
|
MALLOCARRAY_NOFAIL(mult114 , maxval+1);
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtoilbm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtoilbm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtoilbm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtoilbm.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtoilbm.c 2021-12-13 13:11:54.084617737 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtoilbm.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -190,6 +190,7 @@ makeValTable(int const oldmaxval,
|
|
|
|
|
unsigned int i;
|
|
|
|
|
int * table;
|
|
|
|
@ -715,10 +715,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtoilbm.c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (mode) {
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtolj.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtolj.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtolj.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtolj.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtolj.c 2021-12-13 13:11:54.844622398 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtolj.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -182,6 +182,7 @@ int main(int argc, char *argv[]) {
|
|
|
|
|
ppm_readppminit( ifp, &cols, &rows, &maxval, &format );
|
|
|
|
|
pixelrow = ppm_allocrow( cols );
|
|
|
|
@ -727,10 +727,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtolj.c
|
|
|
|
|
obuf = (unsigned char *) pm_allocrow(cols * 3, sizeof(unsigned char));
|
|
|
|
|
cbuf = (unsigned char *) pm_allocrow(cols * 6, sizeof(unsigned char));
|
|
|
|
|
if (mode == C_TRANS_MODE_DELTA)
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtomitsu.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtomitsu.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtomitsu.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtomitsu.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtomitsu.c 2021-12-13 13:11:54.844622398 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtomitsu.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -685,6 +685,8 @@ main(int argc, char * argv[]) {
|
|
|
|
|
medias = MSize_User;
|
|
|
|
|
|
|
|
|
@ -740,10 +740,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtomitsu.c
|
|
|
|
|
medias.maxcols *= 2;
|
|
|
|
|
medias.maxrows *= 2;
|
|
|
|
|
}
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtopcx.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtopcx.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtopcx.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtopcx.c 2020-12-29 11:05:57.373470107 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtopcx.c 2021-12-13 13:11:51.720603235 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtopcx.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -410,6 +410,9 @@ writeRaster16Color(FILE * const ofP,
|
|
|
|
|
|
|
|
|
|
unsigned int row;
|
|
|
|
@ -754,10 +754,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtopcx.c
|
|
|
|
|
MALLOCARRAY_NOFAIL(indexRow, cols);
|
|
|
|
|
MALLOCARRAY(planesrow, bytesPerLine);
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtopict.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtopict.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtopict.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtopict.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtopict.c 2021-12-13 13:11:54.836622349 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtopict.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -450,6 +450,8 @@ main(int argc, const char ** argv) {
|
|
|
|
|
putShort(stdout, 0); /* mode */
|
|
|
|
|
|
|
|
|
@ -767,10 +767,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtopict.c
|
|
|
|
|
outBuf = malloc((unsigned)(cols+cols/MAX_COUNT+1));
|
|
|
|
|
for (row = 0, oc = 0; row < rows; ++row) {
|
|
|
|
|
unsigned int rowSize;
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtopj.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtopj.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtopj.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtopj.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtopj.c 2021-12-13 13:11:54.860622495 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtopj.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -179,6 +179,7 @@ char *argv[];
|
|
|
|
|
pixels = ppm_readppm( ifp, &cols, &rows, &maxval );
|
|
|
|
|
|
|
|
|
@ -779,10 +779,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtopj.c
|
|
|
|
|
obuf = (unsigned char *) pm_allocrow(cols, sizeof(unsigned char));
|
|
|
|
|
cbuf = (unsigned char *) pm_allocrow(cols * 2, sizeof(unsigned char));
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtopjxl.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtopjxl.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtopjxl.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtopjxl.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtopjxl.c 2021-12-13 13:11:54.836622349 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtopjxl.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -266,6 +266,8 @@ main(int argc, const char * argv[]) {
|
|
|
|
|
pm_error("image too large; reduce with ppmscale");
|
|
|
|
|
if (maxval > PCL_MAXVAL)
|
|
|
|
@ -815,10 +815,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtopjxl.c
|
|
|
|
|
inrow = (char *)malloc((unsigned)bpp);
|
|
|
|
|
outrow = (char *)malloc((unsigned)bpp*2);
|
|
|
|
|
runcnt = (signed char *)malloc((unsigned)bpp);
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtowinicon.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtowinicon.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtowinicon.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtowinicon.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtowinicon.c 2021-12-13 13:11:54.836622349 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtowinicon.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -12,6 +12,7 @@
|
|
|
|
|
|
|
|
|
|
#include <math.h>
|
|
|
|
@ -862,10 +862,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtowinicon.c
|
|
|
|
|
entry->size_in_bytes =
|
|
|
|
|
xorBitmap->size + andBitmap->size + 40 + (4 * entry->color_count);
|
|
|
|
|
if (verbose)
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ppmtoxpm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ppmtoxpm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ppmtoxpm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ppmtoxpm.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ppmtoxpm.c 2021-12-13 13:11:54.836622349 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ppmtoxpm.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -198,6 +198,7 @@ genNumstr(unsigned int const input, int
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
|
@ -882,10 +882,10 @@ Index: netpbm-10.93.0/converter/ppm/ppmtoxpm.c
|
|
|
|
|
MALLOCARRAY(cmap, cmapSize);
|
|
|
|
|
if (cmapP == NULL)
|
|
|
|
|
pm_error("Out of memory allocating %u bytes for a color map.",
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/qrttoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/qrttoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/qrttoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/qrttoppm.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/qrttoppm.c 2021-12-13 13:11:54.840622372 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/qrttoppm.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -46,7 +46,7 @@ main( argc, argv )
|
|
|
|
|
|
|
|
|
|
ppm_writeppminit( stdout, cols, rows, maxval, 0 );
|
|
|
|
@ -895,10 +895,10 @@ Index: netpbm-10.93.0/converter/ppm/qrttoppm.c
|
|
|
|
|
if ( buf == (unsigned char *) 0 )
|
|
|
|
|
pm_error( "out of memory" );
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/sldtoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/sldtoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/sldtoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/sldtoppm.c 2020-12-29 11:04:36.104969735 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/sldtoppm.c 2021-12-13 13:11:54.084617737 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/sldtoppm.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -506,6 +506,8 @@ slider(slvecfn slvec,
|
|
|
|
|
|
|
|
|
|
/* Allocate image buffer and clear it to black. */
|
|
|
|
@ -908,10 +908,10 @@ Index: netpbm-10.93.0/converter/ppm/sldtoppm.c
|
|
|
|
|
pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1);
|
|
|
|
|
PPM_ASSIGN(rgbcolor, 0, 0, 0);
|
|
|
|
|
ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0,
|
|
|
|
|
Index: netpbm-10.93.0/converter/ppm/ximtoppm.c
|
|
|
|
|
Index: netpbm-10.96.4/converter/ppm/ximtoppm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/converter/ppm/ximtoppm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/converter/ppm/ximtoppm.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/converter/ppm/ximtoppm.c 2021-12-13 13:11:51.712603186 +0100
|
|
|
|
|
+++ netpbm-10.96.4/converter/ppm/ximtoppm.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -147,6 +147,7 @@ ReadXimHeader(FILE * const in_fp,
|
|
|
|
|
if (header->nchannels == 3 && header->bits_channel == 8)
|
|
|
|
|
header->ncolors = 0;
|
|
|
|
@ -920,10 +920,10 @@ Index: netpbm-10.93.0/converter/ppm/ximtoppm.c
|
|
|
|
|
header->colors = (Color *)calloc((unsigned int)header->ncolors,
|
|
|
|
|
sizeof(Color));
|
|
|
|
|
if (header->colors == NULL) {
|
|
|
|
|
Index: netpbm-10.93.0/editor/pamcut.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pamcut.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pamcut.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pamcut.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pamcut.c 2021-12-13 13:11:54.872622569 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pamcut.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -799,6 +799,8 @@ cutOneImage(FILE * const ifP
|
|
|
|
|
|
|
|
|
|
outpam = inpam; /* Initial value -- most fields should be same */
|
|
|
|
@ -933,22 +933,22 @@ Index: netpbm-10.93.0/editor/pamcut.c
|
|
|
|
|
outpam.width = rightcol - leftcol + 1;
|
|
|
|
|
outpam.height = bottomrow - toprow + 1;
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/editor/pbmreduce.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pbmreduce.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pbmreduce.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pbmreduce.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
@@ -150,6 +150,7 @@ initializeFloydSteinberg(struct FS * co
|
|
|
|
|
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pbmreduce.c 2021-12-13 13:11:55.072623795 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pbmreduce.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -153,6 +153,7 @@ initializeFloydSteinberg(struct FS * co
|
|
|
|
|
unsigned int col;
|
|
|
|
|
struct pm_randSt randSt;
|
|
|
|
|
|
|
|
|
|
+ overflow_add(newcols, 2);
|
|
|
|
|
MALLOCARRAY(fsP->thiserr, newcols + 2);
|
|
|
|
|
MALLOCARRAY(fsP->nexterr, newcols + 2);
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmgamma.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmgamma.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmgamma.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmgamma.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmgamma.c 2021-12-13 13:11:56.088630025 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmgamma.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -596,6 +596,7 @@ createGammaTables(enum transferFunction
|
|
|
|
|
xelval ** const btableP) {
|
|
|
|
|
|
|
|
|
@ -957,10 +957,10 @@ Index: netpbm-10.93.0/editor/pnmgamma.c
|
|
|
|
|
MALLOCARRAY(*rtableP, maxval+1);
|
|
|
|
|
MALLOCARRAY(*gtableP, maxval+1);
|
|
|
|
|
MALLOCARRAY(*btableP, maxval+1);
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmhisteq.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmhisteq.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmhisteq.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmhisteq.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmhisteq.c 2021-12-13 13:11:56.096630074 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmhisteq.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -107,6 +107,7 @@ computeLuminosityHistogram(xel * const *
|
|
|
|
|
unsigned int pixelCount;
|
|
|
|
|
unsigned int * lumahist;
|
|
|
|
@ -969,10 +969,10 @@ Index: netpbm-10.93.0/editor/pnmhisteq.c
|
|
|
|
|
MALLOCARRAY(lumahist, maxval + 1);
|
|
|
|
|
if (lumahist == NULL)
|
|
|
|
|
pm_error("Out of storage allocating array for %u histogram elements",
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmindex.csh
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmindex.csh
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmindex.csh 2020-12-29 11:04:29.184927129 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmindex.csh 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmindex.csh 2021-12-13 13:17:36.802714093 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmindex.csh 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -1,5 +1,8 @@
|
|
|
|
|
#!/bin/csh -f
|
|
|
|
|
#
|
|
|
|
@ -982,10 +982,10 @@ Index: netpbm-10.93.0/editor/pnmindex.csh
|
|
|
|
|
# pnmindex - build a visual index of a bunch of anymaps
|
|
|
|
|
#
|
|
|
|
|
# Copyright (C) 1991 by Jef Poskanzer.
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmpad.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmpad.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmpad.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmpad.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmpad.c 2021-12-13 13:11:55.072623795 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmpad.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -654,6 +654,8 @@ main(int argc, const char ** argv) {
|
|
|
|
|
|
|
|
|
|
computePadSizes(cmdline, cols, rows, &lpad, &rpad, &tpad, &bpad);
|
|
|
|
@ -995,11 +995,11 @@ Index: netpbm-10.93.0/editor/pnmpad.c
|
|
|
|
|
newcols = cols + lpad + rpad;
|
|
|
|
|
|
|
|
|
|
if (cmdline.reportonly)
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmremap.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmremap.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmremap.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmremap.c 2020-12-29 11:04:36.124969859 +0100
|
|
|
|
|
@@ -467,7 +467,7 @@ fserr_init(struct pam * const pamP,
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmremap.c 2021-12-13 13:11:55.076623820 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmremap.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -469,7 +469,7 @@ fserr_init(struct pam * const pamP,
|
|
|
|
|
unsigned int plane;
|
|
|
|
|
|
|
|
|
|
unsigned int const fserrSize = pamP->width + 2;
|
|
|
|
@ -1008,7 +1008,7 @@ Index: netpbm-10.93.0/editor/pnmremap.c
|
|
|
|
|
fserrP->width = pamP->width;
|
|
|
|
|
|
|
|
|
|
MALLOCARRAY(fserrP->thiserr, pamP->depth);
|
|
|
|
|
@@ -506,6 +506,7 @@ floydInitRow(struct pam * const pamP,
|
|
|
|
|
@@ -508,6 +508,7 @@ floydInitRow(struct pam * const pamP,
|
|
|
|
|
|
|
|
|
|
unsigned int col;
|
|
|
|
|
|
|
|
|
@ -1016,10 +1016,10 @@ Index: netpbm-10.93.0/editor/pnmremap.c
|
|
|
|
|
for (col = 0; col < pamP->width + 2; ++col) {
|
|
|
|
|
unsigned int plane;
|
|
|
|
|
for (plane = 0; plane < pamP->depth; ++plane)
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmscalefixed.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmscalefixed.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmscalefixed.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmscalefixed.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmscalefixed.c 2021-12-13 13:11:56.108630148 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmscalefixed.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -214,6 +214,8 @@ compute_output_dimensions(const struct c
|
|
|
|
|
const int rows, const int cols,
|
|
|
|
|
int * newrowsP, int * newcolsP) {
|
|
|
|
@ -1048,10 +1048,10 @@ Index: netpbm-10.93.0/editor/pnmscalefixed.c
|
|
|
|
|
sxscale = SCALE * newcols / cols;
|
|
|
|
|
syscale = SCALE * newrows / rows;
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/editor/pnmshear.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/pnmshear.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/pnmshear.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/pnmshear.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/pnmshear.c 2021-12-13 13:11:56.088630025 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/pnmshear.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -15,6 +15,7 @@
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <math.h>
|
|
|
|
@ -1072,10 +1072,10 @@ Index: netpbm-10.93.0/editor/pnmshear.c
|
|
|
|
|
newcolsD = (double) rows * fabs(shearfac) + cols + 0.999999;
|
|
|
|
|
if (newcolsD > INT_MAX-2)
|
|
|
|
|
pm_error("angle is too close to +/-90 degrees; "
|
|
|
|
|
Index: netpbm-10.93.0/editor/ppmdither.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/ppmdither.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/ppmdither.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/ppmdither.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/ppmdither.c 2021-12-13 13:11:56.484632454 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/ppmdither.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -355,7 +355,11 @@ dithMatrix(unsigned int const dithPower)
|
|
|
|
|
unsigned int const dithMatSize =
|
|
|
|
|
(dithDim * sizeof(*dithMat)) + /* pointers */
|
|
|
|
@ -1089,10 +1089,10 @@ Index: netpbm-10.93.0/editor/ppmdither.c
|
|
|
|
|
dithMat = malloc(dithMatSize);
|
|
|
|
|
|
|
|
|
|
if (dithMat == NULL)
|
|
|
|
|
Index: netpbm-10.93.0/editor/specialty/pamoil.c
|
|
|
|
|
Index: netpbm-10.96.4/editor/specialty/pamoil.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/editor/specialty/pamoil.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/editor/specialty/pamoil.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/editor/specialty/pamoil.c 2021-12-13 13:11:56.084630000 +0100
|
|
|
|
|
+++ netpbm-10.96.4/editor/specialty/pamoil.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -112,6 +112,7 @@ main(int argc, char *argv[] ) {
|
|
|
|
|
tuples = pnm_readpam(ifp, &inpam, PAM_STRUCT_SIZE(tuple_type));
|
|
|
|
|
pm_close(ifp);
|
|
|
|
@ -1101,10 +1101,10 @@ Index: netpbm-10.93.0/editor/specialty/pamoil.c
|
|
|
|
|
MALLOCARRAY(hist, inpam.maxval + 1);
|
|
|
|
|
if (hist == NULL)
|
|
|
|
|
pm_error("Unable to allocate memory for histogram.");
|
|
|
|
|
Index: netpbm-10.93.0/generator/pbmtext.c
|
|
|
|
|
Index: netpbm-10.96.4/generator/pbmtext.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/generator/pbmtext.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/generator/pbmtext.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/generator/pbmtext.c 2021-12-13 13:11:57.516638781 +0100
|
|
|
|
|
+++ netpbm-10.96.4/generator/pbmtext.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -1144,6 +1144,7 @@ getText(PM_WCHAR const cmdli
|
|
|
|
|
"Cannot process",
|
|
|
|
|
lineCount, (unsigned int) MAXLINECHARS);
|
|
|
|
@ -1121,10 +1121,10 @@ Index: netpbm-10.93.0/generator/pbmtext.c
|
|
|
|
|
*hmarginP = 2 * fontP->maxwidth;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Index: netpbm-10.93.0/generator/pgmkernel.c
|
|
|
|
|
Index: netpbm-10.96.4/generator/pgmkernel.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/generator/pgmkernel.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/generator/pgmkernel.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/generator/pgmkernel.c 2021-12-13 13:11:57.824640671 +0100
|
|
|
|
|
+++ netpbm-10.96.4/generator/pgmkernel.c 2021-12-13 13:17:36.818714191 +0100
|
|
|
|
|
@@ -214,6 +214,7 @@ main(int argc, const char * argv[]) {
|
|
|
|
|
|
|
|
|
|
/* Output matrix is symmetric vertically and horizontally. */
|
|
|
|
@ -1133,10 +1133,10 @@ Index: netpbm-10.93.0/generator/pgmkernel.c
|
|
|
|
|
arows = (cmdline.rows + 1) / 2;
|
|
|
|
|
/* Half the number of rows. Add 1 if odd. */
|
|
|
|
|
halfKernel = pgm_allocarray(cmdline.cols, arows);
|
|
|
|
|
Index: netpbm-10.93.0/lib/libpammap.c
|
|
|
|
|
Index: netpbm-10.96.4/lib/libpammap.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/lib/libpammap.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/lib/libpammap.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/lib/libpammap.c 2021-12-13 13:11:56.500632552 +0100
|
|
|
|
|
+++ netpbm-10.96.4/lib/libpammap.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -108,6 +108,8 @@ allocTupleIntListItem(struct pam * const
|
|
|
|
|
*/
|
|
|
|
|
struct tupleint_list_item * retval;
|
|
|
|
@ -1146,10 +1146,10 @@ Index: netpbm-10.93.0/lib/libpammap.c
|
|
|
|
|
unsigned int const size =
|
|
|
|
|
sizeof(*retval) - sizeof(retval->tupleint.tuple)
|
|
|
|
|
+ pamP->depth * sizeof(sample);
|
|
|
|
|
Index: netpbm-10.93.0/lib/libpbm1.c
|
|
|
|
|
Index: netpbm-10.96.4/lib/libpbm1.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/lib/libpbm1.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/lib/libpbm1.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/lib/libpbm1.c 2021-12-13 13:11:57.504638709 +0100
|
|
|
|
|
+++ netpbm-10.96.4/lib/libpbm1.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -79,6 +79,7 @@ pbm_check(FILE * const fil
|
|
|
|
|
} else {
|
|
|
|
|
pm_filepos const bytesPerRow = (cols+7)/8;
|
|
|
|
@ -1158,10 +1158,10 @@ Index: netpbm-10.93.0/lib/libpbm1.c
|
|
|
|
|
pm_check(fileP, checkType, needRasterSize, retvalP);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
Index: netpbm-10.93.0/lib/libpm.c
|
|
|
|
|
Index: netpbm-10.96.4/lib/libpm.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/lib/libpm.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/lib/libpm.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/lib/libpm.c 2021-12-13 13:11:56.496632527 +0100
|
|
|
|
|
+++ netpbm-10.96.4/lib/libpm.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -889,4 +889,53 @@ pm_parse_height(const char * const arg)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -1216,10 +1216,10 @@ Index: netpbm-10.93.0/lib/libpm.c
|
|
|
|
|
+ return realloc(a, b*c);
|
|
|
|
|
+}
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/lib/pm.h
|
|
|
|
|
Index: netpbm-10.96.4/lib/pm.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/lib/pm.h 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/lib/pm.h 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/lib/pm.h 2021-12-13 13:11:56.508632602 +0100
|
|
|
|
|
+++ netpbm-10.96.4/lib/pm.h 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -442,4 +442,11 @@ pm_parse_height(const char * const arg);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
@ -1232,10 +1232,10 @@ Index: netpbm-10.93.0/lib/pm.h
|
|
|
|
|
+void overflow_add(int, int);
|
|
|
|
|
+
|
|
|
|
|
#endif
|
|
|
|
|
Index: netpbm-10.93.0/other/pnmcolormap.c
|
|
|
|
|
Index: netpbm-10.96.4/other/pnmcolormap.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/other/pnmcolormap.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/other/pnmcolormap.c 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/other/pnmcolormap.c 2021-12-13 13:12:01.568663631 +0100
|
|
|
|
|
+++ netpbm-10.96.4/other/pnmcolormap.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -1002,6 +1002,7 @@ colormapToSquare(struct pam * const pamP
|
|
|
|
|
pamP->width = intsqrt;
|
|
|
|
|
else
|
|
|
|
@ -1244,10 +1244,10 @@ Index: netpbm-10.93.0/other/pnmcolormap.c
|
|
|
|
|
}
|
|
|
|
|
{
|
|
|
|
|
unsigned int const intQuotient = colormap.size / pamP->width;
|
|
|
|
|
Index: netpbm-10.93.0/urt/README
|
|
|
|
|
Index: netpbm-10.96.4/urt/README
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/README 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/README 2020-12-29 11:04:36.128969883 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/README 2021-12-13 13:12:01.848665347 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/README 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -18,3 +18,8 @@ in its initializer in the original. But
|
|
|
|
|
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
|
|
|
|
@ -1257,10 +1257,10 @@ Index: netpbm-10.93.0/urt/README
|
|
|
|
|
+Removed pipe through and compress support (unsafe)
|
|
|
|
|
+
|
|
|
|
|
+Alan Cox <alan@redhat.com>
|
|
|
|
|
Index: netpbm-10.93.0/urt/rle_addhist.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/rle_addhist.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/rle_addhist.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/rle_addhist.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/rle_addhist.c 2021-12-13 13:12:01.848665347 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/rle_addhist.c 2021-12-13 13:17:36.822714216 +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,
|
|
|
|
@ -1305,10 +1305,10 @@ Index: netpbm-10.93.0/urt/rle_addhist.c
|
|
|
|
|
++length; /*Cater for the null. */
|
|
|
|
|
|
|
|
|
|
MALLOCARRAY(newc, length);
|
|
|
|
|
Index: netpbm-10.93.0/urt/rle_getrow.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/rle_getrow.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/rle_getrow.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/rle_getrow.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/rle_getrow.c 2021-12-13 13:12:01.556663557 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/rle_getrow.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -17,6 +17,8 @@
|
|
|
|
|
*
|
|
|
|
|
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
|
|
|
|
@ -1326,10 +1326,10 @@ Index: netpbm-10.93.0/urt/rle_getrow.c
|
|
|
|
|
evenlen = (comlen + 1) & ~1; /* make it even */
|
|
|
|
|
if (evenlen) {
|
|
|
|
|
MALLOCARRAY(comment_buf, evenlen);
|
|
|
|
|
Index: netpbm-10.93.0/urt/rle_hdr.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/rle_hdr.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/rle_hdr.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/rle_hdr.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/rle_hdr.c 2021-12-13 13:12:01.848665347 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/rle_hdr.c 2021-12-13 13:17:36.822714216 +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,
|
|
|
|
@ -1365,10 +1365,10 @@ Index: netpbm-10.93.0/urt/rle_hdr.c
|
|
|
|
|
size *= sizeof(char *);
|
|
|
|
|
toHdrP->comments = malloc(size);
|
|
|
|
|
if (!toHdrP->comments)
|
|
|
|
|
Index: netpbm-10.93.0/urt/rle.h
|
|
|
|
|
Index: netpbm-10.96.4/urt/rle.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/rle.h 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/rle.h 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/rle.h 2021-12-13 13:12:01.856665397 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/rle.h 2021-12-13 13:17:36.822714216 +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,
|
|
|
|
@ -1397,10 +1397,10 @@ Index: netpbm-10.93.0/urt/rle.h
|
|
|
|
|
|
|
|
|
|
/* Declare RLE library routines. */
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/urt/rle_open_f.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/rle_open_f.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/rle_open_f.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/rle_open_f.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/rle_open_f.c 2021-12-13 13:12:01.388662528 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/rle_open_f.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -163,65 +163,7 @@ dealWithSubprocess(const char * const f
|
|
|
|
|
FILE ** const fpP,
|
|
|
|
|
bool * const noSubprocessP,
|
|
|
|
@ -1467,10 +1467,10 @@ Index: netpbm-10.93.0/urt/rle_open_f.c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Index: netpbm-10.93.0/urt/rle_putcom.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/rle_putcom.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/rle_putcom.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/rle_putcom.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/rle_putcom.c 2021-12-13 13:12:01.852665372 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/rle_putcom.c 2021-12-13 13:17:36.822714216 +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,
|
|
|
|
@ -1496,10 +1496,10 @@ Index: netpbm-10.93.0/urt/rle_putcom.c
|
|
|
|
|
/* Not found */
|
|
|
|
|
/* Can't realloc because somebody else might be pointing to this
|
|
|
|
|
* comments block. Of course, if this were true, then the
|
|
|
|
|
Index: netpbm-10.93.0/urt/Runput.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/Runput.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/Runput.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/Runput.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/Runput.c 2021-12-13 13:12:01.852665372 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/Runput.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -17,6 +17,8 @@
|
|
|
|
|
*
|
|
|
|
|
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
|
|
|
|
@ -1532,10 +1532,10 @@ Index: netpbm-10.93.0/urt/Runput.c
|
|
|
|
|
if ( h_cmap == NULL )
|
|
|
|
|
{
|
|
|
|
|
fprintf( stderr,
|
|
|
|
|
Index: netpbm-10.93.0/urt/scanargs.c
|
|
|
|
|
Index: netpbm-10.96.4/urt/scanargs.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/urt/scanargs.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/urt/scanargs.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/urt/scanargs.c 2021-12-13 13:12:01.852665372 +0100
|
|
|
|
|
+++ netpbm-10.96.4/urt/scanargs.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -38,6 +38,8 @@
|
|
|
|
|
*
|
|
|
|
|
* Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
|
|
|
|
@ -1556,10 +1556,10 @@ Index: netpbm-10.93.0/urt/scanargs.c
|
|
|
|
|
|
|
|
|
|
static CONST_DECL char * prformat( CONST_DECL char *, int );
|
|
|
|
|
static int isnum( CONST_DECL char *, int, int );
|
|
|
|
|
Index: netpbm-10.93.0/lib/libpam.c
|
|
|
|
|
Index: netpbm-10.96.4/lib/libpam.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- netpbm-10.93.0.orig/lib/libpam.c 2020-12-29 11:04:16.008846007 +0100
|
|
|
|
|
+++ netpbm-10.93.0/lib/libpam.c 2020-12-29 11:04:36.132969908 +0100
|
|
|
|
|
--- netpbm-10.96.4.orig/lib/libpam.c 2021-12-13 13:11:56.116630197 +0100
|
|
|
|
|
+++ netpbm-10.96.4/lib/libpam.c 2021-12-13 13:17:36.822714216 +0100
|
|
|
|
|
@@ -225,7 +225,8 @@ allocPamRow(const struct pam * const pam
|
|
|
|
|
unsigned int const bytesPerTuple = allocationDepth(pamP) * sizeof(sample);
|
|
|
|
|
tuple * tuplerow;
|
|
|
|
|