diff --git a/.gitignore b/.gitignore index cb12c92..6c496c0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /netpbm-10.89.00.tar.xz /netpbm-10.90.00.tar.xz /netpbm-10.92.00.tar.xz +/netpbm-10.93.00.tar.xz diff --git a/netpbm-manfix.patch b/netpbm-manfix.patch index bab0e6c..82a06b0 100644 --- a/netpbm-manfix.patch +++ b/netpbm-manfix.patch @@ -569,897 +569,934 @@ index 1ca53ac..e545986 100644 -diff --git a/userguide/pamstereogram.html b/userguide/pamstereogram.html -index 759ca28..eec0e66 100644 ---- a/userguide/pamstereogram.html -+++ b/userguide/pamstereogram.html -@@ -2,13 +2,16 @@ - Pamstereogram User Manual +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 @@ + Pamtoavs User Manual -

pamstereogram

--Updated: 10 May 2020 +

pamtoavs

+-Updated: 07 February 2010 -
-Table Of Contents + -+

Updated: 10 May 2020

++

Updated: 7 February 2010

+ +

Table Of Contents

+

NAME

--pamstereogram - create a single-image stereogram from a PAM depth map -+

pamstereogram - create a single-image stereogram from a PAM -+depth map

+-

pamtoavs - convert a Netpbm image to an AVS X image ++

pamtoavs - convert a Netpbm image to an AVS X image

SYNOPSIS

-@@ -38,13 +41,13 @@ pamstereogram - create a single-image stereogram from a PAM depth map - [-randomseed=integer] - [-tileable] - [infile] -- -+

- - +@@ -17,7 +19,7 @@ Updated: 07 February 2010

DESCRIPTION

-

This program is part of Netpbm. +

This program is part of Netpbm.

-

pamstereogram inputs a depth map (a map of the distances - from your eye of the points in a scene) and outputs a single-image -@@ -54,22 +57,22 @@ eyes. What's exciting about single-image stereograms is that they - don't require special glasses to view, although it does require a bit - of practice to train your eyes to unfocus properly. The - pamstereogram program provides a wealth of control over how the --stereogram is generated, including the following: -+stereogram is generated, including the following:

- - -

The output is a PAM image on standard output. Options control -@@ -79,7 +82,7 @@ if you will use the image as input to a current Netpbm program, but - many other programs don't know what a PAM is. + 

+     gnuplot> plot 'myimage.avs' binary filetype=avs with rgbimage
+
-

To make a red/green type of stereogram (that you view with 3-D --glasses) instead, see ppm3d. -+glasses) instead, see ppm3d.

+

See the Gnuplot +-manual for more information. ++manual for more information.

OPTIONS

-@@ -87,36 +90,36 @@ glasses) instead, see ppm3d. -

In addition to the options common to all programs based on libnetpbm - (most notably -quiet, see - Common Options), pamstereogram recognizes the following --command line options: -+command line options:

- -

You may use either single or double hyphens to denote options. You - may use either whitespace or an equals sign to separate an option name --from its value. -+from its value.

- -
+@@ -42,29 +44,29 @@ 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.)

--
-verbose -+
-verbose
-
Display messages about image sizes and formats and properties --of the stereogram being generated. -+of the stereogram being generated.
+

AUTHOR

--
-blackandwhite -+
-blackandwhite
-
Produce a single-image random-dot black-and-white stereogram. --This is the default. -+This is the default.
+

Copyright © 2010 Scott Pakin, +-scott+pbm@pakin.org. ++scott+pbm@pakin.org.

--
-grayscale --
Produce a single-image random-dot grayscale stereogram. -+
-grayscale
-+
Produce a single-image random-dot grayscale stereogram.
+

SEE ALSO

--
-color --
Produce a single-image random-dot color stereogram. -+
-color
-+
Produce a single-image random-dot color stereogram.
+

avstopam, + gnuplot, +-pam ++pam

--
-maxval=value -+
-maxval=value
-
Designate the maximum value of each gray/color component, i.e. - the color resolution. Smaller values make the output image have - smaller numbers of unique grays/colors. If you don't specify - -maxval, pamstereogram uses the maxval of the input --image. This option has no effect with -blackandwhite. -+image. This option has no effect with -blackandwhite.
+
--
-patfile=pamfile -+
-patfile=pamfile
-
Specify an image to use as a repeated background pattern for - the stereogram instead of a random-dot pattern. Intricate images - generally produce a crisper 3-D effect that simpler images. The -@@ -125,9 +128,9 @@ grayscale or color) as the pattern file. You cannot specify the - -patfile option along with -blackandwhite, - -grayscale, -color, or -maxval. The - -verbose option will give you information on the ideal --dimensions of the pattern file. -+dimensions of the pattern file.

+

Table Of Contents

--
-xbegin=pixels -+
-xbegin=pixels
-
Specify the horizontal coordinate at which to begin stereogram generation. - The background pattern will be minimally distorted at this point and more - distorted at greater distances. Consider using this in conjunction -@@ -141,7 +144,7 @@ and pamstereogram actually ignores it with respect to -texfile + -

This option was new in Netpbm 10.71 (June 2015). + +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 @@ + Pamtooctaveimg User Manual + +

pamtooctaveimg

+-
+-

Updated: 27 June 2007
+-Table Of Contents ++ ++

Updated: 27 June 2007
++Table Of Contents

--
-texfile=pamfile -+
-texfile=pamfile
-
Specify an image to use as the texture for a mapped-texture - stereogram. The idea is that the depth-map image provides the depth - values of the 3-D object/scene while the texture image provides the -@@ -150,10 +153,10 @@ the depth-map image. (Note that it's required to have the same - dimensions.) The texture image's background color is ignored when - blending colors. +

NAME

--

This option was new in Netpbm 10.53 (December 2010). -- -+

This option was new in Netpbm 10.53 (December 2010).

-+
+-

pamtooctaveimg - convert a Netpbm image to a GNU Octave image ++

pamtooctaveimg - convert a Netpbm image to a GNU Octave image

--
-bgcolor=color -+
-bgcolor=color
-
Use color as the texture image's background color instead - of letting pamstereogram determine it automatically. Specify - the color as described for the -@@ -161,10 +164,10 @@ the color as described for the - routine. The -bgcolor option is meaningful only in conjunction - with -texfile. +

SYNOPSIS

--

This option was new in Netpbm 10.53 (December 2010). -- -+

This option was new in Netpbm 10.53 (December 2010).

-+
+@@ -17,7 +17,7 @@ --
-smoothing=pixels -+
-smoothing=pixels
-
When used without -texfile, attempt to eliminate artifacts - introduced by edges in the depth map if pixels is greater than zero. +

DESCRIPTION

-@@ -175,29 +178,29 @@ by the stereogram's color constraints when producing a mapped-texture - stereogram. In this case, the -smoothing option is helpful - when the texture image includes smooth color transitions (as in a - photograph) but makes crisp texture images (as in a line drawing) --appear blurry. -+appear blurry.

+-

This program is part of Netpbm. ++

This program is part of Netpbm.

-

This option was new in Netpbm 10.53 (December 2010). Before --Netpbm 10.61 (December 2012), it has no effect without -texfile. -+Netpbm 10.61 (December 2012), it has no effect without -texfile.

-+
+

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.)

-- --
-xshift=pixels -+
-xshift=pixels
-
Shift the pattern image (designated by -patfile) to the - right by pixels pixels (default: 0). -- --This option is valid only along with -patfile. -+ -+This option is valid only along with -patfile.
+

ARGUMENTS

--
-yshift pixels -+
-yshift pixels
-
Shift the pattern image (designated by -patfile) - downwards by pixels pixels (default: 0). This option is --valid only along with -patfile. -+valid only along with -patfile.
+@@ -77,7 +77,8 @@ specify netpbmfile, the input is from Standard Input. +

NOTES

--
-magnifypat=scale -+
-magnifypat=scale
-
Magnify each pixel in the pattern file or each random dot by - integral scaling factor scale. Note that - pamstereogram applies the pattern magnification - after pattern shifting (-xshift and ---yshift). -+-yshift).
+

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.

++ -
-guidebottom -
-@@ -211,7 +214,7 @@ square. At that point, a crisp, 3-D image will appear. -

This option was new in Netpbm 10.61 (December 2012). Before that, - the presence of -guidesize, with a positive value, has the same - effect. -- -+

+

HISTORY

-
-guidetop -
-@@ -221,7 +224,7 @@ Same as -guidebottom, except the guides go at the top of the image. - the presence of -guidesize, with a negative value, has the same - effect. +@@ -86,7 +87,7 @@ specify netpbmfile, the input is from Standard Input. +

AUTHOR

--
-guidesize=pixels -+
-guidesize=pixels
+

Copyright (C) 2007 Scott Pakin, +-scott+pbm@pakin.org. ++scott+pbm@pakin.org.

-
The size (width and height) of each guide box. +

SEE ALSO

-@@ -236,15 +239,15 @@ too, and if you specify it with a negative value, it behaves as if you - specified -guidetop and specified guidesize with the absolute - value of that negative value. +@@ -98,15 +99,15 @@ href="http://www.gnu.org/software/octave/doc/interpreter/index.html">octave-dpi=resolution -+
-dpi=resolution
-
Specify the resolution of the output device in dots per inch. - The default is 100 DPI, which represents a fairly crisp screen - resolution. +

Table Of Contents

+ + + +diff --git a/userguide/pnmflip.html b/userguide/pnmflip.html +index 2bd7368..8a1916e 100644 +--- a/userguide/pnmflip.html ++++ b/userguide/pnmflip.html +@@ -5,17 +5,18 @@ --

Before Netpbm 10.53 (December 2010), the default was 96 DPI. -- -+

Before Netpbm 10.53 (December 2010), the default was 96 DPI.

-+
+

NAME

--
-crosseyed -+
-crosseyed
-
Invert the gray levels in the depth map (input image) so that the 3-D - image pops out of the page where it would otherwise sink into the page and - vice versa. Some people are unable to diverge their eyes and can only cross -@@ -255,10 +258,10 @@ colors are farther from the eye. +-pnmflip - replaced by pamflip ++

pnmflip - replaced by pamflip

-

Before Netpbm 10.53 (December 2010), pamstereogram used higher - (lighter) numbers for things closer to the eye without ---crosseyed and vice versa. -+-crosseyed and vice versa.

-+
+

DESCRIPTION

-- --
-makemask -+
-makemask
-
Instead of a stereogram, output a PAM mask image showing - coloring constraints. New pixels will be taken from the pattern - file where the mask is black. Copies of existing pixels will be -@@ -266,30 +269,30 @@ taken from the pattern file where the mask is white. The - -makemask option can be used to help create more - sophisticated pattern files (to use with -patfile) Note that - -makemask ignores -magnifypat; it always produces --masks that assume a pattern magnification of 1. -+masks that assume a pattern magnification of 1.
+-

This program is part of Netpbm. ++

This program is part of Netpbm.

--
-eyesep=inches -+
-eyesep=inches
-
Specify the separation in inches between your eyes. The - default, 2.5 inches (6.4 cm), should be sufficient for most people --and probably doesn't need to be changed. -+and probably doesn't need to be changed.
+

pnmflip was replaced in Netpbm 10.13 (December 2002) by + pamflip. --

-depth=fraction -+
-depth=fraction
-
Specify the output image's depth of field. That is, - fraction represents the fractional distance of the near - plane from the far plane. Smaller numbers make the 3-D image easier - to perceive but flatter. Larger numbers make the 3-D image more - difficult to perceive but deeper. The default, 0.3333, generally --works fairly well. -+works fairly well.
++

DESCRIPTION

+

pamflip is mostly backward compatible with pnmflip, +-but works on PAM images too. ++but works on PAM images too.

--
-planes=near_pixels,far_pixels -+
-planes=near_pixels,far_pixels
-
Explicitly specify the distance between repeated pixels in the near plane - and in the far plane. This is an alternative to - -eyesep and -depth. The following equalities hold: +

One way pamflip is not backward compatible with pnmflip + is that pnmflip lets you specify any number of basic flip options, +@@ -23,12 +24,12 @@ whereas pamflip requires exactly one. (pamflip provides + the -xform option for requesting multiple transformations, though). + Because of this incompatibility, pnmflip still exists as a + separate program, and all it does is translate its options to pamflip +-style and run pamflip. ++style and run pamflip.

+ +

You should not make any new use of pnmflip and if you modify an + existing use, you should upgrade to pamflip. But note that if you + write a program that might have to be used with very old +-Netpbm, pnmflip is the only way to do that. ++Netpbm, pnmflip is the only way to do that.

+ + + +diff --git a/userguide/pnmmercator.html b/userguide/pnmmercator.html +index 998f7fb..65576ac 100644 +--- a/userguide/pnmmercator.html ++++ b/userguide/pnmmercator.html +@@ -18,11 +18,12 @@ projection and vice-versa + [filename] + +

Minimum unique abbreviation of option is acceptable. +-You may use double hyphens instead of single hyphen to denote options. ++You may use double hyphens instead of single hyphen to denote options.

+ +

DESCRIPTION

+ +-

This program is part of Netpbm. ++

This program is part of Netpbm.

+ +

The pnmmercator utility, converts a rectangular projection worldmap + to a Mercator projection format, as used for maps.google.com and many other +@@ -31,34 +32,34 @@ online maps. The map used as input for pnmmercator must have rows for + file will typically be twice as wide as high, but this is not a + requirement. The output file will be using the Mercator +-projection and will get double the height of the input file. ++projection and will get double the height of the input file.

+ +

Maps using the Mercator projection are stretched more the closer a row is + to the North or South Pole. The last few degrees (> 85 or < -85 degrees) + are not part of a Mercator map at all because they would be stretched too much + and the rows close to the edge will show banding, because they originate from +-the same row in the original map. ++the same row in the original map.

+ +

To overcome this, the program will by default do interpolation of pixel + colors, which will eliminate the banding effect, but will cause some blurring + of the output. With the -nomix option, this interpolation of colors isn't + applied. You can obtain the highest quality output by starting with an input + map of high resolution, so that you can follow the pnmmercator +-transformation with a pamscale reduction in size. ++transformation with a pamscale reduction in size.

+ +

This program can also convert a Mercator projection map back to a + rectangular projection based. As said, the Mercator map doesn't have + information about the latitudes close to the poles. Therefore the top rows in + the output image will be identical and copied from the row corresponding with +-latitude of 85 degrees. The same at the bottom of the map. ++latitude of 85 degrees. The same at the bottom of the map.

+ +

Pnmmercator doesn't have any provision for scaling the image. You can scale + by piping the output of the program through Netpbm programs such as +-pamscale. ++pamscale.

+ +

You can find maps to be used as input at flatplanet.sourceforge.net +-or uic.edu/pape. ++or uic.edu/pape.

+ +

The point of a Mercator projection map is that compass directions work on + it. If you draw a straight line northeast from some point on the Mercator +@@ -78,33 +79,33 @@ proportional to angular longitude. +

PARAMETERS

+ +

filename is the name of the input file. If you don't specify +-this, pnmmercator reads the image from standard Input. ++this, pnmmercator reads the image from standard Input.

+ +

OPTIONS

+ +

In addition to the options common to all programs based on libnetpbm + (most notably -quiet, see + Common Options), pnmmercator recognizes the following +-command line options: ++command line options:

+ +
+
-inverse
+
+

With this option a conversion from Mercator to degrees is applied.The +-output image will have half the height of the input map. ++output image will have half the height of the input map.

+
+
-nomix
+
+

Default behaviour is that color blending is applied in between two adjacent + rows. If you specify the -nomix parameter there is no blending. The + consequence is a banding at the top and bottom of the map. With this option, +-the output map will also consist of exactly the same colors as the input. ++the output map will also consist of exactly the same colors as the input.

+
+
-verbose and -vverbose
+
+

This parameter outputs some additional information. If you double the 'v', + it will output debug data about the lat/long degree and Mercator +-conversions. ++conversions.

+
+
+ +@@ -114,25 +115,26 @@ conversions. + ppmglobe + +

HISTORY

+-

pnmmercator was new in Netpbm 10.49 (December 2009). ++

pnmmercator was new in Netpbm 10.49 (December 2009).

+ +

AUTHORS

+

Willem van Schaik (of + pnmtopng/pngtopnm fame) wrote this program in October 2009 and +-suggested it for inclusion in Netpbm. ++suggested it for inclusion in Netpbm.

+ +
+ +

Table Of Contents

+ + +diff --git a/userguide/ppmtogif.html b/userguide/ppmtogif.html +index 513133a..fa72e09 100644 +--- a/userguide/ppmtogif.html ++++ b/userguide/ppmtogif.html +@@ -5,17 +5,16 @@ -

The number of distinct 3-D depths is far -@@ -299,10 +302,10 @@ parameters (distance between eyes and tradeoff between perceptibility - and depth) while -planes is a more computer-centric way (pixel - distances in the resulting stereogram). +

NAME

+ +-ppmtogif - replaced by pamtogif +- +-

DESCRIPTION

+- +-

This program is part of Netpbm. ++

ppmtogif - replaced by pamtogif

++

This program is part of Netpbm.

+ +

ppmtogif was replaced in Netpbm 10.37 (December 2006) by +-pamtogif. ++pamtogif.

+ ++

SYNOPSIS

+

pamtogif is mostly backward compatible with ppmtogif. + ++

DESCRIPTION

+

One way pamtogif is not backward compatible with ppmtogif + is that to specify a transparency (alpha) mask with ppmtogif, you + supply the transparency as a separate pseudo-PGM image and use the +@@ -77,8 +76,8 @@ the alpha image need not have the same maxval as the input. + ppmtogif interprets the alpha file using the alpha file's + maxval. + +-

You cannot specify both -transparent and -alpha. ++

You cannot specify both -transparent and -alpha.

--

This option was new in Netpbm 10.59 (June 2012). -- -+

This option was new in Netpbm 10.59 (June 2012).

-+
--
-randomseed=integer -+
-randomseed=integer
-
Specify a seed to be used for the random number generator. - The default is to use a seed based on the time of day, to one second - granularity. -@@ -313,18 +316,19 @@ every time you run pamstereogram. +- +- ++ ++ +diff -urNp a/userguide/pamstereogram.html b/userguide/pamstereogram.html +--- a/userguide/pamstereogram.html 2021-01-26 13:41:35.057401508 +0100 ++++ b/userguide/pamstereogram.html 2021-01-26 14:23:22.076294594 +0100 +@@ -9,7 +9,8 @@ -

This is irrelevant if you use a pattern file (-patfile - option), because there is no random element to pamstereogram's --behavior. -+behavior.

+

NAME

--

This option was new in Netpbm 10.32 (February 2006). -+

This option was new in Netpbm 10.32 (February 2006).

-+
+-pamstereogram - create a single-image stereogram from a PAM depth map ++

pamstereogram - create a single-image stereogram from a PAM ++depth map

--
-tileable -+
-tileable
+

SYNOPSIS

-
Make the generated image horizontally tileable. This works by - blending a left-to-right rendering (the equivalent - of -xbegin=0) with a right-to-left rendering (the equivalent - of -xbegin=width−1). +@@ -39,13 +40,13 @@ pamstereogram - create a single-image st + [-randomseed=integer] + [-tileable] + [infile] +- ++

--

This option was new in Netpbm 10.91 (June 2020). -+

This option was new in Netpbm 10.91 (June 2020).

-
-@@ -333,7 +337,7 @@ of -xbegin=width−1). +

DESCRIPTION

-

The only parameter, infile, is the name of an input file - that is a depth map image. If you don't specify infile, the --input is from standard input. -+input is from standard input.

+-

This program is part of Netpbm. ++

This program is part of Netpbm.

-

The input is a PAM image of depth 1. Each sample represents the - distance from the eye that the 3-D image at that location should -@@ -344,10 +348,10 @@ be. Lower (darker) numbers mean further from the eye. -

Input Images

+

pamstereogram inputs a depth map (a map of the distances + from your eye of the points in a scene) and outputs a single-image +@@ -55,22 +56,22 @@ eyes. What's exciting about single-image + don't require special glasses to view, although it does require a bit + of practice to train your eyes to unfocus properly. The + pamstereogram program provides a wealth of control over how the +-stereogram is generated, including the following: ++stereogram is generated, including the following:

-

pamstereogram pays no attention to the image's tuple type and --ignores all planes other than plane 0. -+ignores all planes other than plane 0.

+ +

The output is a PAM image on standard output. Options control +@@ -80,7 +81,7 @@ if you will use the image as input to a + many other programs don't know what a PAM is. -

An MTS can employ a background pattern (-patfile). In this - case, pamstereogram replaces background pixels with pattern pixels in --the final step of generating the image. -+the final step of generating the image.

+

To make a red/cyan type of stereogram (that you view with 3-D +-glasses) instead, see ppm3d. ++glasses) instead, see ppm3d.

-

Miscellaneous

+

OPTIONS

+@@ -92,32 +93,32 @@ from its value. +

In addition to the options common to all programs based on libnetpbm + (most notably -quiet, see + Common Options), pamstereogram recognizes the following +-command line options: ++command line options:

-

A good initial test is to input an image consisting of a solid - shape of distance 0 within a large field of maximum distance (e.g., a --white square on a black background). -+white square on a black background).

+
-

With the default values for -dpi and -eyesep, pattern --images that are 128 pixels wide can tile seamlessly. -+images that are 128 pixels wide can tile seamlessly.

+-
-verbose ++
-verbose
+
Display messages about image sizes and formats and properties +-of the stereogram being generated. ++of the stereogram being generated.
+-
-blackandwhite ++
-blackandwhite
+
Produce a single-image random-dot black-and-white stereogram. +-This is the default. ++This is the default.
-

EXAMPLES

+-
-grayscale +-
Produce a single-image random-dot grayscale stereogram. ++
-grayscale
++
Produce a single-image random-dot grayscale stereogram.
-

Generate a SIRDS out of small, brightly colored squares and --prepare it for display on an 87 DPI monitor: -+prepare it for display on an 87 DPI monitor:

+-
-color +-
Produce a single-image random-dot color stereogram. ++
-color
++
Produce a single-image random-dot color stereogram.
- 
-     pamstereogram depthmap.pam \
-@@ -406,7 +410,7 @@ prepare it for display on an 87 DPI monitor:
- 
Generate a SIS by tiling a PPM file (a prior run with
- -verbose indicates how wide the pattern file should be for
- seamless tiling, although any width is acceptable for producing
--SISes):
-+SISes):

+-
-maxval=value
++
-maxval=value

+ 
Designate the maximum value of each gray/color component, i.e.
+ the color resolution. Smaller values make the output image have
+ smaller numbers of unique grays/colors. If you don't specify
+ -maxval, pamstereogram uses the maxval of the input
+-image. This option has no effect with -blackandwhite.
++image. This option has no effect with -blackandwhite.

  
- 
-     pamstereogram depthmap.pam -patfile mypattern.ppm >3d.pam
-@@ -416,7 +420,7 @@ SISes):
- 
Generate an MTS by associating colors with a depth-mapped object
- (using a large eye separation to reduce the number of repetitions of
- the texture image) and twice smoothing over background-colored
--speckles:
-+speckles:

+-
-patfile=pamfile
++
-patfile=pamfile

+ 
Specify an image to use as a repeated background pattern for
+ the stereogram instead of a random-dot pattern. Intricate images
+ generally produce a crisper 3-D effect that simpler images. The
+@@ -126,9 +127,9 @@ grayscale or color) as the pattern file.
+ -patfile option along with -blackandwhite,
+ -grayscale, -color, or -maxval.  The
+ -verbose option will give you information on the ideal
+-dimensions of the pattern file.
++dimensions of the pattern file.

  
- 
-     pamstereogram depthmap.pam \
-@@ -427,21 +431,21 @@ speckles:
+-
-xbegin=pixels
++
-xbegin=pixels

+ 
Specify the horizontal coordinate at which to begin stereogram generation.
+ The background pattern will be minimally distorted at this point and more
+ distorted at greater distances.  Consider using this in conjunction
+@@ -136,38 +137,38 @@ with -xshift to align the horizon
+ horizontal start of stereogram generation. -xbegin is meaningful only
+ in conjunction with -patfile, -makemask, or -texfile,
+ and pamstereogram actually ignores it with respect to -texfile
+-(but may not in a future version of pamstereogram).
++(but may not in a future version of pamstereogram).

  
- 
SEE ALSO

- 
    
--
  • pam
-+
  • pam
    • 
+-
    The default is to begin in the center.
++
    The default is to begin in the center.
    
  
--
  • pamsistoaglyph
-+
  • pamsistoaglyph
    • 
+-
    This option was new in Netpbm 10.71 (June 2015).
++
    This option was new in Netpbm 10.71 (June 2015).
    
  
--
  • ppm3d
-+
  • ppm3d
    • 
+-
    -texfile=pamfile
++
    -texfile=pamfile
    
+ 
    Specify an image to use as the texture for a mapped-texture
+ stereogram.  The idea is that the depth-map image provides the depth
+ values of the 3-D object/scene while the texture image provides the
+ true-color values.  Consequently, the texture image should align with
+ the depth-map image.  (Note that it's required to have the same
+ dimensions.)  The texture image's background color is ignored when
+-blending colors.
++blending colors.
    
  
- 
  • Harold W. Thimbleby, Stuart Inglis, and Ian H. Witten.
- Displaying 3D Images: Algorithms for Single Image Random Dot
- Stereograms. In IEEE Computer, 27(10):38-48,
- October 1994.  DOI: 10.1109/2.318576.
-+href="http://dx.doi.org/10.1109/2.318576">10.1109/2.318576.
    • 
+-
    This option was new in Netpbm 10.53 (December 2010).
++
    This option was new in Netpbm 10.53 (December 2010).
    
  
- 
  • W. A. Steer.
- Stereograms: Technical Details.
--URL: http://www.techmind.org/stereo/stech.html.
-+URL: http://www.techmind.org/stereo/stech.html.
    • 
- 

  
+-
-bgcolor=color
++
-bgcolor=color

+ 
Use color as the texture image's background color instead
+ of letting pamstereogram determine it automatically.  Specify
+ the color as described for the
+ argument of the pnm_parsecolor() library
+ routine.  The -bgcolor option is meaningful only in conjunction
+-with -texfile.
++with -texfile.

  
-@@ -457,24 +461,25 @@ Netpbm 10.61 (December 2012).
+-
This option was new in Netpbm 10.53 (December 2010).
++
This option was new in Netpbm 10.53 (December 2010).

  
  
- 
AUTHOR

--
Copyright © 2006-2020 Scott Pakin, scott+pbm@pakin.org.
-+
Copyright © 2006-2020 Scott Pakin, scott+pbm@pakin.org.

+-
-smoothing=pixels
++
-smoothing=pixels

+ 
When used without -texfile, attempt to eliminate artifacts
+-introduced by edges in the depth map if pixels is greater than zero.
++introduced by edges in the depth map if pixels is greater than zero.

  
- 
Table Of Contents

- 
    
--
  • SYNOPSIS
--
  • DESCRIPTION
--
  • OPTIONS
--
  • PARAMETERS
-+
  • SYNOPSIS
    • 
-+
  • DESCRIPTION
    • 
-+
  • OPTIONS
    • 
-+
  • PARAMETERS
    • 
- 
  • NOTES
--  
- 
- 
-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 @@
- Pamtoavs User Manual
- 
- 
    pamtoavs
    
--Updated: 07 February 2010
--
    
--Table Of Contents
-+
-+
    Updated: 7 February 2010
    
-+
-+
    Table Of Contents
    
+ 
    When used with -texfile, horizontally blur non-background
+ colors into background pixels up to a distance of pixels pixels.
+@@ -176,22 +177,22 @@ by the stereogram's color constraints wh
+ stereogram.  In this case, the -smoothing option is helpful
+ when the texture image includes smooth color transitions (as in a
+ photograph) but makes crisp texture images (as in a line drawing)
+-appear blurry.
++appear blurry.
    
+ 
+ 
    This option was new in Netpbm 10.53 (December 2010).  Before
+-Netpbm 10.61 (December 2012), it has no effect without -texfile.
++Netpbm 10.61 (December 2012), it has no effect without -texfile.
    
+ 
+ 
+-
    -xshift=pixels
++
    -xshift=pixels
    
+ 
    Shift the pattern image (designated by -patfile) to the
+-right by pixels pixels (default: 0).
+-
    
+-This option is valid only along with -patfile.
++right by pixels pixels (default: 0).
    
 +
++
    This option is valid only along with -patfile.
    
  
- 
    NAME
    
+-
    -yshift pixels
++
    -yshift pixels
    
+ 
    Shift the pattern image (designated by -patfile)
+ downwards by pixels pixels (default: 0). This option is
+-valid only along with -patfile.
++valid only along with -patfile.
    
  
--
    pamtoavs - convert a Netpbm image to an AVS X image
-+
    pamtoavs - convert a Netpbm image to an AVS X image
    
+ 
    -yfillshift pixels
    
+ 
    Shift the pattern image (designated by -patfile) downwards
+@@ -200,77 +201,77 @@ population of the pattern.  (If used wit
+ shifts are summed.)  A small -yfillshift helps reduce visual
+ artifacts in the 3-D image.  Steer's website, referenced under
+ SEE ALSO, recommends a shift of approximately
+-1/16" (6–7 pixels at pamstereogram's default of 100 DPI).
++1/16" (6–7 pixels at pamstereogram's default of 100 DPI).
    
  
- 
    SYNOPSIS
    
+-
    This option was new in Netpbm 10.94 (March 2021).
++
    This option was new in Netpbm 10.94 (March 2021).
    
  
-@@ -17,7 +19,7 @@ Updated: 07 February 2010
+-
    -magnifypat=scale
++
    -magnifypat=scale
    
+ 
    Magnify each pixel in the pattern file or each random dot by
+ integral scaling factor scale. Note that
+ pamstereogram applies the pattern magnification
+ after pattern shifting (-xshift and
+--yshift).
++-yshift).
    
  
- 
    DESCRIPTION
    
+-
    -guidebottom
++
    -guidebottom
    
+ 
    
+ Draw a pair of black squares on a white background underneath the stereogram
+ proper. These squares help you guide your eyes into proper focus to view the
+ 3-D image.  The trick is to focus your eyes some distance behind the image,
+ causing you to see four black squares, then continue altering your focus
+ distance until the middle two black squares fuse into a single black
+-square. At that point, a crisp, 3-D image will appear.
++square. At that point, a crisp, 3-D image will appear.
    
  
--
    This program is part of Netpbm.
-+
    This program is part of Netpbm.
    
+ 
    This option was new in Netpbm 10.61 (December 2012).  Before that,
+ the presence of -guidesize, with a positive value, has the same
+-effect.
++effect.
    
  
- 
    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:
    
+-
    -guidetop
++
    -guidetop
    
+ 
    
+-Same as -guidebottom, except the guides go at the top of the image.
++Same as -guidebottom, except the guides go at the top of the image.
    
  
- 
    -     gnuplot> plot 'myimage.avs' binary filetype=avs with rgbimage
- 
    
+ 
    This option was new in Netpbm 10.61 (December 2012).  Before that,
+ the presence of -guidesize, with a negative value, has the same
+-effect.
++effect.
    
  
- 
    See the Gnuplot
--manual for more information.
-+manual for more information.
    
+-
    -guidesize=pixels
++
    -guidesize=pixels
    
  
+-
    The size (width and height) of each guide box.
++
    The size (width and height) of each guide box.
    
  
- 
    OPTIONS
    
-@@ -42,29 +44,29 @@ 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.)
    
+-
    This is valid only with -guidetop or -guidebottom.
++
    This is valid only with -guidetop or -guidebottom.
    
  
- 
    AUTHOR
    
+-
    Default is 20.
++
    Default is 20.
    
  
- 
    Copyright © 2010 Scott Pakin,
--scott+pbm@pakin.org.
-+scott+pbm@pakin.org.
    
+ 
    Before Netpbm 10.61 (December 2012), if you don't specify this option,
+ pamstereogram draws no guides.  If you specify it with a positive
+ value, pamstereogram behaves as if you specified -guidebottom
+ too, and if you specify it with a negative value, it behaves as if you
+ specified -guidetop and specified guidesize with the absolute
+-value of that negative value.
++value of that negative value.
    
  
- 
    SEE ALSO
    
+-
    -dpi=resolution
++
    -dpi=resolution
    
+ 
    Specify the resolution of the output device in dots per inch.
+ The default is 100 DPI, which represents a fairly crisp screen
+-resolution.
++resolution.
    
  
- 
    avstopam,
- gnuplot,
--pam
-+pam
    
+-
    Before Netpbm 10.53 (December 2010), the default was 96 DPI.
++
    Before Netpbm 10.53 (December 2010), the default was 96 DPI.
    
  
- 
    
  
- 
    Table Of Contents
    
+-
    -crosseyed
++
    -crosseyed
    
+ 
    Invert the gray levels in the depth map (input image) so that the 3-D
+ image pops out of the page where it would otherwise sink into the page and
+ vice versa. Some people are unable to diverge their eyes and can only cross
+ them. The -crosseyed option enables such people to see the 3-D image as
+ intended.  You can also specify the -crosseyed option if you prefer
+ using depth maps in which darker colors are closer to the eye and lighter
+-colors are farther from the eye.
++colors are farther from the eye.
    
  
- 
+ 
    Before Netpbm 10.53 (December 2010), pamstereogram used higher
+ (lighter) numbers for things closer to the eye without
+--crosseyed and vice versa.
++-crosseyed and vice versa.
    
  
- 
-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 @@
- Pamtooctaveimg User Manual
- 
- 
    pamtooctaveimg
    
--
    
--
    Updated: 27 June 2007
    
--Table Of Contents
-+
-+
    Updated: 27 June 2007
    
-+Table Of Contents
    
  
- 
    NAME
    
+-
    -makemask
++
    -makemask
    
+ 
    Instead of a stereogram, output a PAM mask image showing
+ coloring constraints. New pixels will be taken from the pattern
+ file where the mask is black. Copies of existing pixels will be
+@@ -278,30 +279,30 @@ taken from the pattern file where the ma
+ -makemask option can be used to help create more
+ sophisticated pattern files (to use with -patfile) Note that
+ -makemask ignores -magnifypat; it always produces
+-masks that assume a pattern magnification of 1.
++masks that assume a pattern magnification of 1.
    
  
--
    pamtooctaveimg - convert a Netpbm image to a GNU Octave image
-+
    pamtooctaveimg - convert a Netpbm image to a GNU Octave image
    
+-
    -eyesep=inches
++
    -eyesep=inches
    
+ 
    Specify the separation in inches between your eyes. The
+ default, 2.5 inches (6.4 cm), should be sufficient for most people
+-and probably doesn't need to be changed.
++and probably doesn't need to be changed.
    
  
- 
    SYNOPSIS
    
+-
    -depth=fraction
++
    -depth=fraction
    
+ 
    Specify the output image's depth of field. That is,
+ fraction represents the fractional distance of the near
+ plane from the far plane. Smaller numbers make the 3-D image easier
+ to perceive but flatter. Larger numbers make the 3-D image more
+ difficult to perceive but deeper. The default, 0.3333, generally
+-works fairly well.
++works fairly well.
    
  
-@@ -17,7 +17,7 @@
+-
    -planes=near_pixels,far_pixels
++
    -planes=near_pixels,far_pixels
    
+ 
    Explicitly specify the distance between repeated pixels in the near plane
+ and in the far plane.  This is an alternative to
+ -eyesep and -depth.  The following equalities hold:
  
- 
    DESCRIPTION
    
+ 
      
+-  
    • eyesep = 2 * far
++  
    • eyesep = 2 * far
      • 
+   
    • depth = 2 * (far − near) /
+-      (2 * far − near)
++      (2 * far − near)
      • 
+ 
    
  
--
    This program is part of Netpbm.
-+
    This program is part of Netpbm.
    
+ 
    The number of distinct 3-D depths is far
+@@ -309,34 +310,35 @@ and in the far plane.  This is an altern
+ and -depth are a more human-friendly way to specify stereoscopic
+ parameters (distance between eyes and tradeoff between perceptibility
+ and depth) while -planes is a more computer-centric way (pixel
+-distances in the resulting stereogram).
++distances in the resulting stereogram).
    
  
- 
    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.)
    
+-
    This option was new in Netpbm 10.59 (June 2012).
++
    This option was new in Netpbm 10.59 (June 2012).
    
++
    
  
- 
    ARGUMENTS
    
  
-@@ -77,7 +77,8 @@ specify netpbmfile, the input is from Standard Input.
- 
    NOTES
    
+-
    -randomseed=integer
++
    -randomseed=integer
    
+ 
    Specify a seed to be used for the random number generator.
+ The default is to use a seed based on the time of day, to one second
+-granularity.
++granularity.
    
  
- 
    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.
    
-+
+ 
    It is useful to specify the seed if you want to create reproducible
+ results.  With the same random seed, you should get identical results
+-every time you run pamstereogram.
++every time you run pamstereogram.
    
  
- 
    HISTORY
    
+ 
    This is irrelevant if you use a pattern file (-patfile
+ option), because there is no random element to pamstereogram's
+-behavior.
++behavior.
    
  
-@@ -86,7 +87,7 @@ specify netpbmfile, the input is from Standard Input.
- 
    AUTHOR
    
+-
    This option was new in Netpbm 10.32 (February 2006).
++
    This option was new in Netpbm 10.32 (February 2006).
    
  
- 
    Copyright (C) 2007 Scott Pakin,
--scott+pbm@pakin.org.
-+scott+pbm@pakin.org.
    
+-
    -tileable
++
    -tileable
    
  
- 
    SEE ALSO
    
+ 
    Make the generated image horizontally tileable.  This works by
+ blending a left-to-right rendering (the equivalent
+ of -xbegin=0) with a right-to-left rendering (the equivalent
+ of -xbegin=width−1).
  
-@@ -98,15 +99,15 @@ href="http://www.gnu.org/software/octave/doc/interpreter/index.html">octaveThis option was new in Netpbm 10.91 (June 2020).
++
    This option was new in Netpbm 10.91 (June 2020).
    
  
- 
    Table Of Contents
    
- 
- 
- 
-diff --git a/userguide/pnmflip.html b/userguide/pnmflip.html
-index 2bd7368..8a1916e 100644
---- a/userguide/pnmflip.html
-+++ b/userguide/pnmflip.html
-@@ -5,17 +5,18 @@
+
-

NAME

+@@ -345,21 +347,21 @@ of -xbegin=width−1). --pnmflip - replaced by pamflip -+

pnmflip - replaced by pamflip

+

The only parameter, infile, is the name of an input file + that is a depth map image. If you don't specify infile, the +-input is from standard input. ++input is from standard input.

+ +

The input is a PAM image of depth 1. Each sample represents the + distance from the eye that the 3-D image at that location should +-be. Lower (darker) numbers mean further from the eye. ++be. Lower (darker) numbers mean further from the eye.

+ +

NOTES

+ +

Input Images

+ +

pamstereogram pays no attention to the image's tuple type and +-ignores all planes other than plane 0. ++ignores all planes other than plane 0.

-

DESCRIPTION

+

Like any Netpbm program, pamstereogram will accept PNM +-input as if it were the PAM equivalent. ++input as if it were the PAM equivalent.

--

This program is part of Netpbm. -+

This program is part of Netpbm.

+

Mapped-texture Stereograms

-

pnmflip was replaced in Netpbm 10.13 (December 2002) by - pamflip. +@@ -367,12 +369,12 @@ input as if it were the PAM equivalent. + drawn with true colors. Unlike a SIRDS or tiled-image SIS, however, + the image portrayed by an MTS is apparent in normal 2-D viewing. It + appears repeated multiple times and overlapped with itself, but it is +-not hidden. ++not hidden.

-+

DESCRIPTION

-

pamflip is mostly backward compatible with pnmflip, --but works on PAM images too. -+but works on PAM images too.

+

You create an MTS with pamstereogram by passing the filename + of a PAM "texture image" with a -texfile option. A + texture image portrays the same 3-D object as the depth-map image but +-indicates the colors that the program should apply to the object. ++indicates the colors that the program should apply to the object.

-

One way pamflip is not backward compatible with pnmflip - is that pnmflip lets you specify any number of basic flip options, -@@ -23,12 +24,12 @@ whereas pamflip requires exactly one. (pamflip provides - the -xform option for requesting multiple transformations, though). - Because of this incompatibility, pnmflip still exists as a - separate program, and all it does is translate its options to pamflip --style and run pamflip. -+style and run pamflip.

+

pamstereogram ignores the texture image's background color when it + overlaps copies of the 3-D object. This prevents, for example, a bright-red +@@ -382,32 +384,32 @@ object remains bright red. A consequenc + best when the objects in the texture image have a crisp outline. Smooth + transitions to the background color result in unwanted color artifacts around + edges because the program ignores only exact matches with the +-background color. ++background color.

-

You should not make any new use of pnmflip and if you modify an - existing use, you should upgrade to pamflip. But note that if you - write a program that might have to be used with very old --Netpbm, pnmflip is the only way to do that. -+Netpbm, pnmflip is the only way to do that.

+

You should specify a larger-than-normal value for -eyesep + (and/or -dpi) when producing an MTS. Otherwise, the 3-D object will + repeat so many times that most colored pixels will overlap other colored +-pixels, reducing the number of true-colored pixels that remain. ++pixels, reducing the number of true-colored pixels that remain.

- - -diff --git a/userguide/pnmmercator.html b/userguide/pnmmercator.html -index 998f7fb..65576ac 100644 ---- a/userguide/pnmmercator.html -+++ b/userguide/pnmmercator.html -@@ -18,11 +18,12 @@ projection and vice-versa - [filename] +

An MTS can employ a background pattern (-patfile). In this + case, pamstereogram replaces background pixels with pattern pixels in +-the final step of generating the image. ++the final step of generating the image.

-

Minimum unique abbreviation of option is acceptable. --You may use double hyphens instead of single hyphen to denote options. -+You may use double hyphens instead of single hyphen to denote options.

-

DESCRIPTION

+

Miscellaneous

--

This program is part of Netpbm. -+

This program is part of Netpbm.

+

A good initial test is to input an image consisting of a solid + shape of distance 0 within a large field of maximum distance (e.g., a +-white square on a black background). ++white square on a black background).

-

The pnmmercator utility, converts a rectangular projection worldmap - to a Mercator projection format, as used for maps.google.com and many other -@@ -31,34 +32,34 @@ online maps. The map used as input for pnmmercator must have rows for - file will typically be twice as wide as high, but this is not a - requirement. The output file will be using the Mercator --projection and will get double the height of the input file. -+projection and will get double the height of the input file.

+

With the default values for -dpi and -eyesep, pattern +-images that are 128 pixels wide can tile seamlessly. ++images that are 128 pixels wide can tile seamlessly.

-

Maps using the Mercator projection are stretched more the closer a row is - to the North or South Pole. The last few degrees (> 85 or < -85 degrees) - are not part of a Mercator map at all because they would be stretched too much - and the rows close to the edge will show banding, because they originate from --the same row in the original map. -+the same row in the original map.

-

To overcome this, the program will by default do interpolation of pixel - colors, which will eliminate the banding effect, but will cause some blurring - of the output. With the -nomix option, this interpolation of colors isn't - applied. You can obtain the highest quality output by starting with an input - map of high resolution, so that you can follow the pnmmercator --transformation with a pamscale reduction in size. -+transformation with a pamscale reduction in size.

+

EXAMPLES

-

This program can also convert a Mercator projection map back to a - rectangular projection based. As said, the Mercator map doesn't have - information about the latitudes close to the poles. Therefore the top rows in - the output image will be identical and copied from the row corresponding with --latitude of 85 degrees. The same at the bottom of the map. -+latitude of 85 degrees. The same at the bottom of the map.

+

Generate a SIRDS out of small, brightly colored squares and +-prepare it for display on an 87 DPI monitor: ++prepare it for display on an 87 DPI monitor:

-

Pnmmercator doesn't have any provision for scaling the image. You can scale - by piping the output of the program through Netpbm programs such as --pamscale. -+pamscale.

+ 
+     pamstereogram depthmap.pam \
+@@ -439,21 +441,21 @@ speckles:
  
- 
You can find maps to be used as input at flatplanet.sourceforge.net
--or uic.edu/pape.
-+or uic.edu/pape.

+ 
SEE ALSO

+ 
    
+-
  • pam
++
  • pam
    • 
  
- 
    The point of a Mercator projection map is that compass directions work on
- it.  If you draw a straight line northeast from some point on the Mercator
-@@ -78,33 +79,33 @@ proportional to angular longitude.
- 
    PARAMETERS
    
+-
  • pamsistoaglyph
++
  • pamsistoaglyph
    • 
  
- 
    filename is the name of the input file.  If you don't specify
--this, pnmmercator reads the image from standard Input.
-+this, pnmmercator reads the image from standard Input.
    
+-
  • ppm3d
++
  • ppm3d
    • 
  
- 
    OPTIONS
    
+ 
  • Harold W. Thimbleby, Stuart Inglis, and Ian H. Witten.
+ Displaying 3D Images: Algorithms for Single Image Random Dot
+ Stereograms. In IEEE Computer, 27(10):38-48,
+ October 1994.  DOI: 10.1109/2.318576.
++href="http://dx.doi.org/10.1109/2.318576">10.1109/2.318576.
    • 
  
- 
    In addition to the options common to all programs based on libnetpbm
- (most notably -quiet, see 
- Common Options), pnmmercator recognizes the following
--command line options:
-+command line options:
    
+ 
  • W. A. Steer.
+ Stereograms: Technical Details.
+-URL: http://www.techmind.org/stereo/stech.html.
++URL: http://www.techmind.org/stereo/stech.html.
    • 
+ 

  
- 

- 
-inverse

- 

- 
With this option a conversion from Mercator to degrees is applied.The
--output image will have half the height of the input map.
-+output image will have half the height of the input map.

- 

- 
-nomix

- 

- 
Default behaviour is that color blending is applied in between two adjacent
- rows. If you specify the -nomix parameter there is no blending. The
- consequence is a banding at the top and bottom of the map.  With this option,
--the output map will also consist of exactly the same colors as the input.
-+the output map will also consist of exactly the same colors as the input.

- 

- 
-verbose and -vverbose

- 

- 
This parameter outputs some additional information. If you double the 'v',
- it will output debug data about the lat/long degree and Mercator
--conversions.
-+conversions.

- 

- 

  
-@@ -114,25 +115,26 @@ conversions.
- ppmglobe
+@@ -461,32 +463,32 @@ URL: HISTORY
--
pnmmercator was new in Netpbm 10.49 (December 2009).
-+
pnmmercator was new in Netpbm 10.49 (December 2009).

+ 
pamstereogram was new in Netpbm 10.22 (April 2004), but probably
+ broken beyond usability until Netpbm 10.32 (February 2006) and Netpbm 10.26.23
+-(January 2006).
++(January 2006).

  
- 
AUTHORS

+ 
A backward incompatible change to the way you request guide boxes
+ (-guidetop, -guidebottom, -guidesize happened in
+-Netpbm 10.61 (December 2012).
++Netpbm 10.61 (December 2012).

  
- 
Willem van Schaik (of
- pnmtopng/pngtopnm fame) wrote this program in October 2009 and
--suggested it for inclusion in Netpbm.
-+suggested it for inclusion in Netpbm.

  
- 

+ 
AUTHOR

+-
Copyright © 2006-2020 Scott Pakin, scott+pbm@pakin.org.
++
Copyright © 2006-2020 Scott Pakin, scott+pbm@pakin.org.

  
  
Table Of Contents

  
  
  
-diff --git a/userguide/ppmtogif.html b/userguide/ppmtogif.html
-index 513133a..fa72e09 100644
---- a/userguide/ppmtogif.html
-+++ b/userguide/ppmtogif.html
-@@ -5,17 +5,16 @@
- 
- 
NAME

- 
--ppmtogif - replaced by pamtogif
--
--
DESCRIPTION

--
--
This program is part of Netpbm.
-+
ppmtogif - replaced by pamtogif

-+
This program is part of Netpbm.

- 
- 
ppmtogif was replaced in Netpbm 10.37 (December 2006) by
--pamtogif.
-+pamtogif.

- 
-+
SYNOPSIS

- 
pamtogif is mostly backward compatible with ppmtogif.
- 
-+
DESCRIPTION

- 
One way pamtogif is not backward compatible with ppmtogif
- is that to specify a transparency (alpha) mask with ppmtogif, you
- supply the transparency as a separate pseudo-PGM image and use the
-@@ -77,8 +76,8 @@ the alpha image need not have the same maxval as the input.
- ppmtogif interprets the alpha file using the alpha file's
- maxval.
- 
--
You cannot specify both -transparent and -alpha.
-+
You cannot specify both -transparent and -alpha.

- 
- 
--
--
-+
-+
diff --git a/netpbm.spec b/netpbm.spec
index a730fa1..8c65173 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,6 +1,6 @@
 Summary:         A library for handling different graphics file formats
 Name:            netpbm
-Version:         10.92.00
+Version:         10.93.00
 Release:         1%{?dist}
 # See copyright_summary for details
 License:         BSD and GPLv2 and IJG and MIT and Public Domain
@@ -230,6 +230,9 @@ popd
 %doc userguide/*
 
 %changelog
+* Mon Jan 25 2021 Josef Ridky  - 10.93.00-1
+- New upstream release 10.93.00 (#1911159)
+
 * Wed Oct 07 2020 Josef Ridky  - 10.92.00-1
 - New upstream release 10.92.00 (#1851753)
 
diff --git a/sources b/sources
index 3a7ec07..d5383d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (netpbm-10.92.00.tar.xz) = 8737c7c644029fc256eb645a8dda3be6a9f2cf23c1634877f6bc6e7f5b5a453db5eae116a2dcde47e15dd3faf5816a01eb0185545d7acdabd475886924cb16c4
+SHA512 (netpbm-10.93.00.tar.xz) = 18ff08b1d3672d792dab78b69eb4ef1a9874266b1dfbf5801a53ca172c0dcbbae8d1269297a56e06ed45ccfdff6a6ae5399e60b4bafdcb9d2cb9de800e2bc07c