diff --git a/.gitignore b/.gitignore index 6c496c0..b07bd74 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /netpbm-10.90.00.tar.xz /netpbm-10.92.00.tar.xz /netpbm-10.93.00.tar.xz +/netpbm-10.94.05.tar.xz diff --git a/netpbm-CAN-2005-2471.patch b/netpbm-CAN-2005-2471.patch index 77a3cd7..ae17d6b 100644 --- a/netpbm-CAN-2005-2471.patch +++ b/netpbm-CAN-2005-2471.patch @@ -1,8 +1,7 @@ -diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c -index f534265..2ab48ab 100644 ---- a/converter/other/pstopnm.c -+++ b/converter/other/pstopnm.c -@@ -896,11 +896,11 @@ execGhostscript(int const inputPipeFd, +diff -urNp a/converter/other/pstopnm.c b/converter/other/pstopnm.c +--- a/converter/other/pstopnm.c 2018-07-23 15:14:51.200658026 +0200 ++++ b/converter/other/pstopnm.c 2018-07-23 15:18:12.579910612 +0200 +@@ -896,11 +896,11 @@ execGhostscript(int const ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, textalphabitsopt, "-q", "-dNOPAUSE", @@ -10,10 +9,9 @@ index f534265..2ab48ab 100644 + "-dPARANOIDSAFER", "-"); } -- execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, + execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, - textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL); -+ execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", -+ "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); ++ "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", ghostscriptProg, errno, strerror(errno)); diff --git a/netpbm-manfix.patch b/netpbm-manfix.patch index c28beb4..f90130a 100644 --- a/netpbm-manfix.patch +++ b/netpbm-manfix.patch @@ -1,30 +1,25 @@ -diff --git a/userguide/avstopam.html b/userguide/avstopam.html -index eb39766..d104518 100644 ---- a/userguide/avstopam.html -+++ b/userguide/avstopam.html -@@ -2,25 +2,29 @@ +diff -urNp a/userguide/avstopam.html b/userguide/avstopam.html +--- a/userguide/avstopam.html 2021-06-02 12:56:59.584286425 +0200 ++++ b/userguide/avstopam.html 2021-06-02 15:00:33.799300026 +0200 +@@ -2,12 +2,13 @@
Updated: 7 February 2010
++Updated: 07 February 2010
+ + -+ - Table Of Contentsavstopam - convert an AVS X image to a Netpbm image +
avstopam - convert an AVS X image to a Netpbm image
-+ --avstopam - [avsfile] +@@ -16,40 +17,40 @@ Updated: 07 February 2010
avsfile is the input file, which defaults to Standard Input. - Output is always on Standard Output. -@@ -30,26 +34,26 @@ Output is always on Standard Output. +-Output is always on Standard Output. ++Output is always on Standard Output.
+ +There are no command line options defined specifically
for avstopam, but it recognizes the options common to all
programs based on libnetpbm (See
@@ -48,8 +46,8 @@ index eb39766..d104518 100644
Copyright © 2010 Scott Pakin,
--scott+pbm@pakin.org.
-+scott+pbm@pakin.org.AUTHOR
This page, part of the Netpbm user's guide, describes FAX formats in relation to Netpbm facilities. - -+
The ITU (formerly CCITT) publishes standards for operation of fax machines (the idea is to provide a way to be sure that a fax machine is able to receive a fax sent by another). These standards incidentally specify graphics file -diff --git a/userguide/pampaintspill.html b/userguide/pampaintspill.html -index eeb1cac..e42db76 100644 ---- a/userguide/pampaintspill.html -+++ b/userguide/pampaintspill.html +diff -urNp a/userguide/libnetpbm_ug.html b/userguide/libnetpbm_ug.html +--- a/userguide/libnetpbm_ug.html 2021-06-02 12:56:59.584286425 +0200 ++++ b/userguide/libnetpbm_ug.html 2021-06-02 14:36:35.392293125 +0200 +@@ -374,7 +374,7 @@ plain format. +
The Libnetpbm Netpbm Image +-Processing Manual describes the the libnetpbm functions for ++Processing Manual describes the libnetpbm functions for + processing image data. + +
The Libnetpbm Utility Manual +diff -urNp a/userguide/pamfunc.html b/userguide/pamfunc.html +--- a/userguide/pamfunc.html 2021-06-02 12:56:59.585286434 +0200 ++++ b/userguide/pamfunc.html 2021-06-02 14:40:09.474375441 +0200 +@@ -60,7 +60,7 @@ output image. + and bit string (such as and with 01001000). For the arithmetic functions, the + function arguments and results are the fraction that a sample is of the + maxval, i.e. normal interpretation of PAM tuples. But for the bit string +-functions, the value is the the bit string whose value as a binary cipher is ++functions, the value is the bit string whose value as a binary cipher is + the sample value, and the maxval indicates the width of the bit string. + +
pammixmulti - blend together multiple PAM images ++
pammixmulti - blend together multiple PAM images
+ + +Minimum unique abbreviation of an option is acceptable. You can use a + single hyphen instead of double hyphens to denote options. You can use white + space in place of the equals sign to separate an option name from its +-value. ++value.
+ + +This file is part of Netpbm. ++
This file is part of Netpbm.
+ +pammixmulti mixes two or more images to produce a new image. The +-program provides multiple ways to interpret "mix." ++program provides multiple ways to interpret "mix."
+ + +In addition to the options common to all programs based on libnetpbm + (most notably -quiet, see + Common Options), pammixmulti recognizes the following +-command line options: ++command line options:
+ +mask
, each pixel in the output is produced by a
+ weighted average of the corresponding pixels from all the input images based
+-on the grayscale level of an additional mask image.
++on the grayscale level of an additional mask image.
+
+
+ Use this to ensure you get the same image on separate invocations. ++
Use this to ensure you get the same image on separate invocations.
+ +You supply the names of the files to mix as non-option arguments. ++
You supply the names of the files to mix as non-option arguments.
+ + +Average a bunch of PPM images to produce a new PAM image: ++
Average a bunch of PPM images to produce a new PAM image:
+
+ pammixmulti input*.ppm >output.ppm
+
+
+ Mix these same images by taking each pixel from a randomly selected input +-image: ++image:
+ +
+ pammixmulti --blend=random input*.ppm >output.ppm
+
+
+ Use a mask image to control the fading among input images on a +-pixel-by-pixel basis: ++pixel-by-pixel basis:
+ +
+ pammixmulti --blend=mask --maskfile=mask.pgm >output.pam \
+ one.pam two.pam three.pam four.pam
+
+
+-Do the same but with more abrupt transitions: ++
Do the same but with more abrupt transitions:
+ +
+ pammixmulti --blend=mask --maskfile=mask.pgm --stdev=0.0 >output.pam \
+ one.pam two.pam three.pam four.pam
+
+
+-and now with more gradual transitions: ++
and now with more gradual transitions:
+ +
+ pammixmulti --blend=mask --maskfile=mask.pgm --stdev=1.0 >output.pam \
+@@ -133,12 +133,12 @@ pixel-by-pixel basis:
+
+ HISTORY
+
+-pammixmulti was new in Netpbm 10.85 (December 2018).
++
pammixmulti was new in Netpbm 10.85 (December 2018).
+
+
+ AUTHOR
+
+-Copyright 2018 Scott Pakin, scott+pbm@pakin.org.
++
Copyright 2018 Scott Pakin, scott+pbm@pakin.org.
+
+ SEE ALSO
+
+@@ -146,20 +146,20 @@ pixel-by-pixel basis:
+ ppmmix,
+ pamarith,
+ pnm,
+-pam
++pam
+
+
+ Table Of Contents
+
+
+
+
Updated: 09 February 2020 +-Updated: 06 March 2021 ++
Updated: 06 March 2021
-Table Of Contents
+Table Of Contents
Minimum unique abbreviations of option are acceptable. You may use double hyphens instead of single hyphen to denote options. You may use @@ -142,11 +317,7 @@ index eeb1cac..e42db76 100644
pampaintspill produces a smooth color gradient from all of the non-background-colored pixels in an input image, effectively "spilling - paint" onto the background. pampaintspill is similar to --pamgradient but differs in the following characteristics: -+pamgradient but differs in the following characteristics:
- -Results are generally best when the input image contains just a few, crisp spots of color. Use your drawing program's pencil tool — as opposed to a @@ -177,40 +350,91 @@ index eeb1cac..e42db76 100644
Use this to ensure you get the same image on separate invocations. ++
Use this to ensure you get the same image on separate invocations.
+ +-This option was new in Netpbm 10.94 (March 2021). ++
This option was new in Netpbm 10.94 (March 2021).
+pampaintspill was new in Netpbm 10.50 (March 2010). ++
pampaintspill was new in Netpbm 10.50 (March 2010).
+ + +Copyright © 2010 Scott Pakin, +-scott+pbm@pakin.org. ++scott+pbm@pakin.org.
+ +Updated: 31 July 2010
+
-Table Of Contents
++Table Of Contents
Updated: 31 July 2010
-+ -+ -+ -+ -+pamrecolor - alter colors without affecting luminance
- -Minimum unique abbreviation of option is acceptable. You may use double -@@ -30,7 +34,7 @@ space in place of the equals sign to separate an option name from its value. + hyphens instead of single hyphen to denote options. You may use white +-space in place of the equals sign to separate an option name from its value. ++space in place of the equals sign to separate an option name from its value.
pamrecolor changes an image's colors to be as close as possible to given target colors but with the constraint that the -@@ -39,7 +43,7 @@ image will look identical if both are converted to grayscale +@@ -39,17 +39,17 @@ image will look identical if both are co (e.g. with ppmtopgm). You can have pamrecolor select target colors randomly, specify a single hue for the entire image, or take the -target colors from a target image. +target colors from a target image.
-pamrecolor works on pseudo-Netpbm images based on arbitrary - color spaces. You can define the color space explicitly or choose one -@@ -49,7 +53,7 @@ of many that pamrecolor knows by name. +
In addition to real Netpbm images, pamrecolor works on pseudo-Netpbm + images based on arbitrary color spaces. You can define the color space +-explicitly or choose one of many that pamrecolor knows by name. ++explicitly or choose one of many that pamrecolor knows by name.
+ +The output is a PAM image on standard output. Options control the exact format of the PAM. If you want a PNM (PBM, PGM, or PPM) image, use pamtopnm on the output. There is no need to convert if you will use the image as input to a current Netpbm @@ -237,7 +464,7 @@ index 3f341d4..a5f2671 100644
In addition to the options common to all programs based on libnetpbm (most notably -quiet, see Common Options), pamrecolor recognizes the following @@ -246,7 +473,19 @@ index 3f341d4..a5f2671 100644
pamrecolor knows the following color spaces (name values): ++
pamrecolor knows the following color spaces (name values):
+ +The default is "ntsc" because this is the color space that the Netpbm formats and many graphics utilities use. As a counterexample, GIMP uses sRGB as its native color @@ -255,1747 +494,1378 @@ index 3f341d4..a5f2671 100644
The luminance values pamrecolor uses for each of the above come from Bruce Lindbloom's - --Computing RGB-to-XYZ and XYZ-to-RGB matrices page. -+Computing RGB-to-XYZ and XYZ-to-RGB matrices page.
- -If you specify neither --targetcolor nor - --colorfile, pamrecolor will randomly select a target color for --each pixel of the input image. -+each pixel of the input image.
- -You may not specify both -targetcolor and -colorfile. - -@@ -154,7 +158,7 @@ image to be repeated in a tile pattern. - -
If you specify neither --targetcolor nor - --colorfile, pamrecolor will randomly select a target color for --each pixel of the input image. -+each pixel of the input image.
- -You may not specify both -targetcolor and -colorfile. - -@@ -176,23 +180,23 @@ invocations. - -
This command tints an image yellow: -+
This command tints an image yellow:
- --- pamrecolor --targetcolor=yellow colorpic.pam > yellowpic.pam -+ pamrecolor --targetcolor=yellow colorpic.pam > yellowpic.pam -- -
This command takes the colors from colorpicture.ppm and applies --them to graypicture.pgm: -+them to graypicture.pgm:
- --- pamrecolor --colorfile=colorpic.ppm graypic.pgm > colorizedpic.pam -+ pamrecolor --colorfile=colorpic.ppm graypic.pgm > colorizedpic.pam -- -
The grayscale version of colorizedpic.pam will look just like - graypic.pgm. Note that if you use a non-Netpbm tool to do the conversion to - grayscale, you may additionally need to specify an --appropriate --colorspace value for your conversion tool. -+appropriate --colorspace value for your conversion tool.
- - -Scott Pakin wrote pamrecolor in July 2010. -+
Scott Pakin wrote pamrecolor in July 2010.
- -pamrecolor was new in Netpbm 10.52 (September 2010). - -@@ -229,7 +233,7 @@ photograph of the late 1800s). -
Copyright (C) 2010 Scott --Pakin, scott+pbm@pakin.org. -+Pakin, scott+pbm@pakin.org.
- - -Updated: 5 April 2009
-+ -+ -+ - -pamsistoaglyph - convert a single-image stereogram to a red/cyan -+anaglyphic image
- - -All options can be abbreviated to their shortest unique prefix. You - may use either white space or an equals sign between an option name --and its value. -+and its value.
- - -This program is part of Netpbm. - -
pamsistoaglyph reads a Netpbm image as input and --produces a Netpbm image as output. -+produces a Netpbm image as output.
- -pamsistoaglyph takes a single-image stereogram - (SIS) such as those produced by pamsistoaglyph is to help people who have trouble --viewing single-image stereograms see the intriguing 3-D effect. -+viewing single-image stereograms see the intriguing 3-D effect.
- -pamsistoaglyph can convert single-image random-dot - stereograms (SIRDS), wallpaper stereograms, and even dual-image --stereograms to anaglyphic images. -+stereograms to anaglyphic images.
- - -In addition to the options common to all programs based on libnetpbm (most notably -quiet, see - Common Options), pamsistoaglyph recognizes the following + Common Options), pbmtog3 recognizes the following -command line options: +command line options:
-For most images, no command-line options need to be specified. The --following options are available, however, for unusual circumstances. -+following options are available, however, for unusual circumstances.
-The registration algorithm used by pamsistoaglyph - was developed specifically for this program. As far as the author - knows, there are no existing algorithms for converting stereograms to --anaglyphs. The algorithm works as follows: -+anaglyphs. The algorithm works as follows:
- -Copyright (C) 2009 Scott --Pakin, scott+pbm@pakin.org. -+Pakin, scott+pbm@pakin.org.
- - -Updated: 7 February 2010
-+ -+ -+ - -pamtoavs - convert a Netpbm image to an AVS X image -+
pamtoavs - convert a Netpbm image to an AVS X image
- -This program is part of Netpbm. -+
This program is part of Netpbm.
- -pamtoavs reads a Netpbm image as input and produces a Stardent - AVS -@@ -27,14 +29,14 @@ href="http://www.gnuplot.info/">Gnuplot v4.2 and later can use. -
netpbmfile is the input file, which defaults to Standard Input. - Output is always on Standard Output. - --
Try the following: -+
Try the following:
- -- gnuplot> plot 'myimage.avs' binary filetype=avs with rgbimage -- -
See the Gnuplot --manual for more information. -+manual for more information.
- - -There are no command line options defined specifically - for pamtoavs, but it recognizes the options common to all - programs based on libnetpbm (See --Common Options.) -+Common Options.)
- -Copyright © 2010 Scott Pakin, --scott+pbm@pakin.org. -+scott+pbm@pakin.org.
- -avstopam, - gnuplot, --pam -+pam
- -Updated: 27 June 2007
--Table Of Contents
-+
-+
Updated: 27 June 2007
-+Table Of Contents
pamtooctaveimg - convert a Netpbm image to a GNU Octave image -+
pamtooctaveimg - convert a Netpbm image to a GNU Octave image
- -This program is part of Netpbm. -+
This program is part of Netpbm.
- -pamtooctaveimg reads a Netpbm image as input and produces a GNU Octave image file as output. -@@ -45,7 +45,7 @@ Image Processing chapter of the GNU Octave manual for details. -
There are no command line options defined specifically - for pamtooctaveimg, but it recognizes the options common to all - programs based on libnetpbm (See --Common Options.) -+Common Options.)
- -There is no octavetopam program. However, GNU Octave's --saveimage command can save images in PPM format. -+saveimage command can save images in PPM format.
-+ - +Before Netpbm 10.79 (June 2017), there was a different program by the same +-name in Netpbm, which was written by by Paul Haeberli ++name in Netpbm, which was written by Paul Haeberli + <paul@manray.sgi.com> in 1989 + and then modified extensively by others. -
Copyright (C) 2007 Scott Pakin, --scott+pbm@pakin.org. -+scott+pbm@pakin.org.
- -+diff -urNp a/userguide/pampaintspill.html b/userguide/pampaintspill.html +--- a/userguide/pampaintspill.html 2021-06-02 12:56:59.575286342 +0200 ++++ b/userguide/pampaintspill.html 2021-06-02 15:06:31.354767352 +0200 @@ -2,12 +2,12 @@
+diff -urNp a/userguide/pamrecolor.html b/userguide/pamrecolor.html +--- a/userguide/pamrecolor.html 2021-06-02 12:56:59.574286333 +0200 ++++ b/userguide/pamrecolor.html 2021-06-02 15:09:53.837724488 +0200 +@@ -2,9 +2,9 @@
-diff --git a/userguide/pamsistoaglyph.html b/userguide/pamsistoaglyph.html -index 1ca53ac..e545986 100644 ---- a/userguide/pamsistoaglyph.html -+++ b/userguide/pamsistoaglyph.html -@@ -1,15 +1,18 @@ - -
-
-diff --git a/userguide/pamtoavs.html b/userguide/pamtoavs.html -index 5d0ae35..bee1a40 100644 ---- a/userguide/pamtoavs.html -+++ b/userguide/pamtoavs.html -@@ -2,13 +2,15 @@ -
-
-diff --git a/userguide/pamtooctaveimg.html b/userguide/pamtooctaveimg.html -index 4e09e8e..d2cc50b 100644 ---- a/userguide/pamtooctaveimg.html -+++ b/userguide/pamtooctaveimg.html -@@ -2,13 +2,13 @@ -
-
-