summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2020-08-29 20:03:25 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2020-08-29 20:03:25 +0000
commit522e1137e915e3964fd98a3d6f24ef8f84c753fd (patch)
treec356d116053f941c07c96f73d9030e81a265061f
parent378cc5d23e36e0f47bf6020bbe630bba59debb8e (diff)
downloadnetpbm-mirror-522e1137e915e3964fd98a3d6f24ef8f84c753fd.tar.gz
netpbm-mirror-522e1137e915e3964fd98a3d6f24ef8f84c753fd.tar.xz
netpbm-mirror-522e1137e915e3964fd98a3d6f24ef8f84c753fd.zip
miscellaneous update
git-svn-id: http://svn.code.sf.net/p/netpbm/code/userguide@3934 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--pam.html4
-rw-r--r--pamdepth.html21
-rw-r--r--pamtowinicon.html12
-rw-r--r--winicontopam.html6
4 files changed, 33 insertions, 10 deletions
diff --git a/pam.html b/pam.html
index a45846e4..09a62ecc 100644
--- a/pam.html
+++ b/pam.html
@@ -218,7 +218,7 @@ in Row 1 is one at the top of the image rather than the bottom).
 
 <p>Tuple type never determines how many samples are in a tuple (that is
 instead determined by the DEPTH header line).  Tuple type could be said to
-imply a depth (number of samples per tuple)it because certain tuple types are
+imply a depth (number of samples per tuple) because certain tuple types are
 valid only in combination with certain DEPTH values, but it is good
 programming practice to use DEPTH for the depth when decoding the raster and
 separately validate that the depth is consistent with the tuple type.  Also,
@@ -263,7 +263,7 @@ image.  The first plane represents red, the second green, and the third blue.
 contains transparency information.  In that variation, the tuple type
 has "_ALPHA" added to it (e.g. "RGB_ALPHA") and one
 more plane.  The highest numbered plane is the opacity plane (sometimes
-called an transparency plane or transparency plane).
+called an alpha plane or transparency plane).
 
 <p>In this kind of image, the color represented by a pixel is actually
 a combination of an explicitly specified foreground color and a background
diff --git a/pamdepth.html b/pamdepth.html
index 56bbda07..98cdabbe 100644
--- a/pamdepth.html
+++ b/pamdepth.html
@@ -2,7 +2,7 @@
 <html><head><title>Pamdepth User Manual</title></head>
 <body>
 <h1>pamdepth</h1>
-Updated: 19 December 2013
+Updated: 26 August 2020
 <br>
 <a href="#index">Table Of Contents</a>
 
@@ -44,6 +44,25 @@ rely on that.  If you specify a <i>newmaxval</i> less than 256, the
 resulting file should be readable by any program that worked with PNM
 files before April 2000.
 
+<h3 id="output_format">Output Format</h3>
+
+<p>The output format (PBM, etc.) and, in the case of PAM, tuple type, of the
+output is usually the same as the input.
+
+<p>However, changing the depth of a black and white image does not make
+sense, except to turn it into a grayscale image, so if the input is a black
+and white image, <b>pamdepth</b> makes the output grayscale.  To be more
+precise, if the input is a PBM image, the output is PGM, and if the input
+is a PAM with tuple type BLACK_AND_WHITE or BLACK_AND_WHITE_ALPHA, the
+output is a PAM with tuple type GRAYSCALE or GRAYSCALE_ALPHA, respectively.
+
+<p>This conversion happens even if the new maxval is 1.
+
+<p>Before Netpbm 10.92 (September 2020), <b>pamdepth</b> failed if the input
+was PAM with a black and white tuple type and the new maxval was anything but
+1.  But it always promoted PBM to PGM.
+
+  
 <h2 id="options">OPTIONS</h2>
 
 <p>There are no command line options defined specifically
diff --git a/pamtowinicon.html b/pamtowinicon.html
index d1cdc16d..bff915ba 100644
--- a/pamtowinicon.html
+++ b/pamtowinicon.html
@@ -47,11 +47,15 @@ line options:
 <dl compact>
 <dt><b>-pngthreshold=</b><i>threshold</i>
 
-<dd><b>pamtowinicon</b> encodes images with resolutions above or equal <i>threshold</i> by <i>threshold</i> as PNG by running
+<dd><b>pamtowinicon</b> encodes images with resolutions above or
+equal <i>threshold</i> by <i>threshold</i> as PNG by running
 <a href="pnmtopng.html"><b>pnmtopng</b></a>.  Other images it encodes
 using the more traditional BMP format.
 
-<p>When the program uses PNG encoding for a 5-channel PAM with separate AND mask (see below), it discards the AND mask.
+<p>When the program uses PNG encoding for a 5-channel PAM with separate AND
+mask (see below), it discards the AND mask.  Because PNG has always had the
+ability to specify transparency, the Windows icon format does not provide for
+a separate and mask when the icon is encoded in PNG.
 
 <p>The default value for <i>threshold</i> is 128.
 
@@ -79,8 +83,8 @@ as input and outputs an single Windows icon file containing those images.
 <h3 id="paminput">PAM Input</h3>
 
 <p>
-<b>pamtowinicon</b> interprets the PAM images as follows, based on
-the number of channels.
+<b>pamtowinicon</b> interprets the PAM images as follows, based on the number
+of channels.
 
 <table style="text-align=center" border=1>
 <?makeman l l. ?>
diff --git a/winicontopam.html b/winicontopam.html
index e5e6ff5a..53d3b357 100644
--- a/winicontopam.html
+++ b/winicontopam.html
@@ -29,7 +29,7 @@ its value.
 <p>This program is part of <a href="index.html">Netpbm</a>.
 
 <p><b>winicontopam</b> reads a Microsoft Windows icon file and
-converts it to one or more RGB_ALPHA Netpbm PAM files.
+converts it to one or more RGB_ALPHA Netpbm PAM images.
 
 <p>The transparency channel is copied from the 8-bit transparency data from
 the icon, if present.  If no 8-bit transparency data is available, the
@@ -71,8 +71,8 @@ image (largest, then most bits per pixel).
 <dt><b>-andmasks</b>
 
 <dd>If the image to be extracted contains both 8-bit transparency
-data and AND mask, write a five-channel Netpbm PAM file with the AND
-mask stored to the fifth plane.
+data and AND mask, produce five-channel Netpbm PAM images with the AND
+mask as the fifth plane.
 
 <dt><b>-verbose</b>