Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checked in at 2014-11-24 11:18:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netpbm (Old) and /work/SRC/openSUSE:Factory/.netpbm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netpbm" Changes: -------- --- /work/SRC/openSUSE:Factory/netpbm/netpbm.changes 2014-09-10 07:27:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netpbm.new/netpbm.changes 2014-11-24 11:18:28.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 19 09:11:12 UTC 2014 - [email protected] + +- updated to 10.68.1 + * pnmconvol: add -bias . + * Remove pnmcomp, install a pnmcomp symlink for pamcomp. + * Fix incorrect option parsing when there are multiple common + options (e.g. -plain -quiet). + * cameratopam: fix buffer overflow. + * cameratopam: fix incorrect output. + * ppmtopict: Fix unconditional crash. + +------------------------------------------------------------------- Old: ---- netpbm-10.67.4-documentation.tar.bz2 netpbm-10.67.4-nohpcdtoppm-noppmtompeg.tar.bz2 New: ---- netpbm-10.68.1-documentation.tar.bz2 netpbm-10.68.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netpbm.spec ++++++ --- /var/tmp/diff_new_pack.dn7l0G/_old 2014-11-24 11:18:32.000000000 +0100 +++ /var/tmp/diff_new_pack.dn7l0G/_new 2014-11-24 11:18:32.000000000 +0100 @@ -17,11 +17,11 @@ %define libmaj 11 -%define libmin 67 +%define libmin 68 %define libver %{libmaj}.%{libmin} Name: netpbm -Version: 10.67.4 +Version: 10.68.1 Release: 0 Summary: A Powerful Graphics Conversion Package License: BSD-3-Clause and GPL-2.0+ and IJG and MIT and SUSE-Public-Domain ++++++ netpbm-10.67.4-documentation.tar.bz2 -> netpbm-10.68.1-documentation.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/anytopnm.html new/netpbm.sourceforge.net/doc/anytopnm.html --- old/netpbm.sourceforge.net/doc/anytopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/anytopnm.html 2014-11-15 04:18:45.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Anytopnm User Manual</TITLE></HEAD> <BODY> <H1>anytopnm</H1> -Updated: 05 September 2006 +Updated: 15 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -13,6 +13,7 @@ <B>anytopnm</B> [<I>file</I>] + <H2 id="description">DESCRIPTION</H2> <p>This program is part of <a href="index.html">Netpbm</a>. @@ -53,6 +54,16 @@ <P>If <I>file</I> is <B>-</B> or not given, <B>anytopnm</B> takes its input from Standard Input. +<p>Many image formats are capable of representing multiple images. In +most cases, <b>anytopnm</b> converts these to multi-image Netpbm images, +but for some formats, <b>anytopnm</b> converts only the first image and +ignores the rest. + +<p>In the case of a multi-image GIF input, <b>anytopnm</b> converts all the +images starting with Netpbm 10.69 (December 2014), but only the first in +earlier releases. + + <H2 id="seealso">SEE ALSO</H2> <B><A HREF="pamfile.html">pamfile</A></B>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/avstopam.html new/netpbm.sourceforge.net/doc/avstopam.html --- old/netpbm.sourceforge.net/doc/avstopam.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/avstopam.html 2014-09-10 18:49:39.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"> <head> <title>Avstopam User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/extendedopacity.html new/netpbm.sourceforge.net/doc/extendedopacity.html --- old/netpbm.sourceforge.net/doc/extendedopacity.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/extendedopacity.html 2014-09-10 18:45:15.000000000 +0200 @@ -154,9 +154,9 @@ P. Haeberli and D. Voorhies. <cite>Image Processing by Linear Interpolation and Extrapolation</cite>. IRIS Universe Magazine No. 28, Silicon Graphics, Aug, 1994. -<!--no_print--><p> -<!--no_print--><a href=../index.html#interp> -<!--no_print--><img src=gobot.gif alt="" width=564 height=25 border=0></a> -<!--no_print--><br> + +<p> +<img src=gobot.gif alt="" width=564 height=25 border=0> + </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/giftopnm.html new/netpbm.sourceforge.net/doc/giftopnm.html --- old/netpbm.sourceforge.net/doc/giftopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/giftopnm.html 2014-11-15 04:42:13.000000000 +0100 @@ -53,18 +53,19 @@ <DT><B>--alphaout=</B><I>alpha-filename</I> <DD><B>giftopnm </B> creates a PBM file containing the transparency -information from the input image. This "alpha image" is the same -dimensions as the input image, and each pixel of the alpha image tells whether -the corresponding pixel of the input image is transparent. Black means -transparent; white means opaque. If you don't specify <B>--alphaout</B>, -<B>giftopnm</B> does not generate an alpha file, and if the input image has an -alpha channel, <B>giftopnm</B> simply discards it. +information from the input image. This transparency image is the same +dimensions as the input image, and each pixel of the transparency image tells +whether the corresponding pixel of the input image is transparent. Black +means transparent; white means opaque. If you don't +specify <B>--alphaout</B>, <B>giftopnm</B> does not generate a transparency +file, and if the input image has a transparency channel, <B>giftopnm</B> simply +discards it. <P>If you specify <B>-</B> as the filename, <B>giftopnm</B> writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. <P>See <B><A HREF="pamcomp.html">pamcomp</A></B> for one way to use -the alpha output file. +the transparency output file. <DT><B>-verbose</B> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ilbmtoppm.html new/netpbm.sourceforge.net/doc/ilbmtoppm.html --- old/netpbm.sourceforge.net/doc/ilbmtoppm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ilbmtoppm.html 2014-11-12 04:54:39.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Ilbmtoppm User Manual</TITLE></HEAD> <BODY> <H1>ilbmtoppm</H1> -Updated: 04 October 1993 +Updated: 12 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -26,6 +26,7 @@ [<B>-verbose</B>] [<I>ILBMfile</I>] + <H2 id="description">DESCRIPTION</H2> <p>This program is part of <a href="index.html">Netpbm</a>. @@ -55,6 +56,13 @@ <DL COMPACT> +<dt><b>-transparent </b><i>color</i> +<dd>This is the color that should "show through" in places where +the image is transparent. + +<P><i>color</i> is like the <a href="libppm.html#colorname">argument of +the <b>ppm_parsecolor()</b> library routine</a>. + <DT><B>-verbose</B> <DD>Give some information about the ILBM file. @@ -70,6 +78,16 @@ these flags are not set in the CAMG chunk (or if there is no CAMG chunk). +<dt><b>-maskfile</b> <i>filename</i> + +<dd>This names a file for <b>ilbmtoppm</b> to create with the image's +transparency mask. The mask file is a PBM image which maps to the input image +with white pixels representing transparent pixels in the image and black +pixels representing opaque pixels. + +<p>If you don't specfy this, or the image does not contain transparency +information, <b>ilbmtoppm</b> does not create a mask file. + <dt><b>-cmaponly</b> <dd>With this option, <b>ilbmtoppm</b> generates a PPM of the ILBM's <em>color @@ -79,7 +97,6 @@ ILBM is a pure color map stream (it has a bitmap header with an <i>nplanes</i> value of zero or has no BODY chunk. - <DT><B>-adjustcolors</B> <DD>If all colors in the CMAP have a value of less then 16, ilbmtoppm @@ -88,6 +105,7 @@ </DL> + <H2 id="limitations">LIMITATIONS</H2> <p>The multipalette PCHG BigLineChanges and Huffman decompression code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/palmtopnm.html new/netpbm.sourceforge.net/doc/palmtopnm.html --- old/netpbm.sourceforge.net/doc/palmtopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/palmtopnm.html 2014-11-15 04:41:10.000000000 +0100 @@ -104,7 +104,7 @@ <H2 id="limitations">LIMITATIONS</H2> -<P>You cannot generate an alpha mask if the Palm Bitmap has a +<P>You cannot generate a transparency mask if the Palm Bitmap has a transparent color. However, you can still do this with <B>ppmcolormask</B> with a Netpbm pipe similar to: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pam.html new/netpbm.sourceforge.net/doc/pam.html --- old/netpbm.sourceforge.net/doc/pam.html 2013-11-28 00:17:59.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pam.html 2014-11-15 04:41:04.000000000 +0100 @@ -249,7 +249,7 @@ 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 alpha plane or transparency plane). +called an transparency 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pambackground.html new/netpbm.sourceforge.net/doc/pambackground.html --- old/netpbm.sourceforge.net/doc/pambackground.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pambackground.html 2014-11-09 19:02:50.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pambackground User Manual</TITLE></HEAD> <BODY> <H1>pambackground</H1> -Updated: 31 December 2006 +Updated: 09 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -28,19 +28,18 @@ <p>This program is part of <a href="index.html">Netpbm</a>. -<p><b>pambackground</b> reads a PNM or PAM image as input. -It generates as output a PAM image that identifies the background area -of the image (a mask). - -<p>To identify the background, <b>pambackground</b> assumes the image -is a foreground image, smaller than the total image size, placed over -a single-color background. It assumes that foreground image is solid --- it does not have holes through which the background can be seen. -So in specific, <b>pambackground</b> first identifies the background -color, then finds all contiguous pixels of that color in regions -touching any edge of the image. Think of it as starting at each of -the four edges and moving inward as far as possible until it hits -pixels of another color (the foreground image). +<p><b>pambackground</b> reads a PNM or PAM image as input. It generates as +output a PAM image that identifies the background area of the image (a mask). + +<p>To identify the background, <b>pambackground</b> assumes the image is a +foreground image, smaller than the total image size, placed over a +single-color background. It assumes that foreground image is solid -- it does +not have holes through which the background can be seen. So in +specific, <b>pambackground</b> first identifies the background color, then +finds all contiguous pixels of that color in regions touching any edge of the +image. Think of it as starting at each of the four edges and moving inward +and spreading out as far as possible until it hits pixels of another color +(the foreground image). <p><b>pambackground</b> identifies the background color as follows: If any 3 corners of the image are the same color, that's the background @@ -60,11 +59,19 @@ 20% of "SkyBlue" to SkyBlue, then run <b>pambackground</b> on it. -<p>In Release 10.37, <b>pambackground</b> does not really -do what is promised above. It can't see places where the background -appears in the middle of a row (think of the sky between two buildings). -From Release 10.38 forward, it snakes through whatever passages it has to -to find all the background. +<p>A more convenient means of dealing with a multi-shade background is +to use <b>pnmquant</b> to produce a version of the image with a very small +number of colors. The background would likely then be all one color. + +<p>If the <b>pnmquant</b> and <b>ppmchange</b> methods above do not +adequately distinguish foreground colors from background colors, you can +try a more elaborate method using <b>pnmremap</b>. +If you can manually create a palette with +one color to which all the background pixels are similar, and other colors +to which the foreground pixels are similar, you can use it as input to +<b>pnmremap</b> to create a smarter version of what you get with the +<b>pnmquant</b> or <b>ppmchange</b> methods, so that <b>pambackground</b> is +more likely to separate background from foreground as your eye does. <p>The PAM that <b>pambackground</b> creates has a single plane, with a maxval of 1. The sample value 1 means background; 0 means @@ -81,12 +88,12 @@ could replace the entire background (or foreground) of your image with something else. -<p>Another common use is to make an image with the background -transparent (in some image format that has a concept of transparency; -not Netpbm formats) so that image can be overlaid onto another image -later. Netpbm's converters to image formats that have transparency -(e.g. PNG) let you use the mask that <b>pambackground</b> generates -to identify the transparent areas for the output. +<p>Another common use is to make an image with the background transparent (in +some image format that has a concept of transparency) so that image can be +overlaid onto another image later. Netpbm's converters to image formats that +have transparency (e.g. PNG) let you use the mask that <b>pambackground</b> +generates to identify the transparent areas for the output. You can create +a PAM image with transparency with <b>pamstack</b>. <p>To simply make a mask of all the areas of a specified color, use <b>ppmcolormask</b>. If you have a unique background color (one that @@ -94,6 +101,7 @@ a background mask in cases that <b>pambackground</b> cannot: where there are see-through holes in the foreground image. + <H2 id="options">OPTIONS</H2> <dl> @@ -104,12 +112,33 @@ </dl> +<h2 id="examples">EXAMPLES</h2> + +<p> +<pre> +<kbd> + $ pambackground test.ppm | pnminvert >/tmp/bgmask.pgm + $ pamcomp -alpha=bgmask.pgm test.ppm wallpaper.ppm >output.ppm +</kbd> +</pre> +<p> +<pre> +<kbd> + $ pnmquant 5 test.pgm | pambackground test.ppm >/tmp/bgmask.pam +</kbd> +</pre> + + <H2 id="seealso">SEE ALSO</H2> <B><A HREF="ppmcolormask.html">ppmcolormask</A></B>, <B><A HREF="pamcomp.html">pamcomp</A></B>, +<B><A HREF="ppmchange.html">ppmchange</A></B>, +<B><A HREF="pnmquant.html">pnmquant</A></B>, +<B><A HREF="pnmremap.html">pnmremap</A></B>, <B><A HREF="pamtopnm.html">pamtopnm</A></B>, <B><A HREF="pgmtopgm.html">pgmtopgm</A></B>, +<B><A HREF="pamstack.html">pamstack</A></B>, <B><A HREF="pnm.html">pnm</A></B>, <B><A HREF="pam.html">pam</A></B>, @@ -123,6 +152,7 @@ <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> <LI><A HREF="#options">OPTIONS</A> +<LI><A HREF="#examples">OPTIONS</A> <LI><A HREF="#seealso">SEE ALSO</A> </UL> </BODY> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamcomp.html new/netpbm.sourceforge.net/doc/pamcomp.html --- old/netpbm.sourceforge.net/doc/pamcomp.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamcomp.html 2014-11-15 04:40:49.000000000 +0100 @@ -51,21 +51,21 @@ beneath it. <P>If you add the <B>-alpha</B> option, then <B>pamcomp</B> uses the -image in file <I>alpha-pgmfile</I> as an alpha mask, which means it +image in file <I>alpha-pgmfile</I> as a transparency mask, which means it determines the level of transparency of each point in the overlay -image. The alpha mask must have the same dimensions as the overlay -image. In places where the alpha mask defines the overlay image to be +image. The transparency mask must have the same dimensions as the overlay +image. In places where the transparency mask defines the overlay image to be opaque, the composite output contains only the contents of the overlay image; the underlying image is totally blocked out. In places where -the alpha mask defines the overlay image to be transparent, the +the transparency mask defines the overlay image to be transparent, the composite output contains none of the overlay image; the underlying -image shows through completely. In places where the alpha mask shows +image shows through completely. In places where the transparency mask shows a value in between opaque and transparent (translucence), the composite image contains a mixture of the overlay image and the underlying image and the level of translucence determines how much of each. -<P>The alpha mask is a PGM file in which a white pixel represents +<P>The transparency mask is a PGM file in which a white pixel represents opaqueness and a black pixel transparency. Anything in between is translucent. (Like any Netpbm program, <B>pamcomp</B> will see a PBM file as if it is PGM). @@ -73,17 +73,17 @@ <p>If the overlay image is a PAM image of tuple type RGB_ALPHA or GRAYSCALE_ALPHA, then the overlay image contains transparency information itself and <b>pamcomp</b> uses it the same way as the -alpha mask described above. If you supply both an overlay image that -has transparency information and an alpha mask, <b>pamcomp</b> +transparency mask described above. If you supply both an overlay image that +has transparency information and a transparency mask, <b>pamcomp</b> multiplies the two opacities to get the opacity of the overlay pixel. <p>Before Netpbm 10.25 (October 2004), <b>pamcomp</b> did not recognize the transparency information in a PAM image -- it just ignored it. So people had -to make appropriate alpha masks in order to have a non-opaque overlay. Some +to make appropriate transparency masks in order to have a non-opaque overlay. Some Netpbm programs that convert from image formats that contain transparency information are not able to create RGB_ALPHA or GRAYSCALE_ALPHA PAM output, so you have to use the old method -- extract the transparency information from -the original into a separate alpha mask and use that as input to +the original into a separate transparency mask and use that as input to <b>pamcomp</b>. <P>The output image is always of the same dimensions as the underlying @@ -187,17 +187,17 @@ <DT><B>-alpha=</B><i>alpha-pgmfile</i> <DD> -This option names a file that contains the alpha mask. If you don't -specify this option, there is no alpha mask, which is equivalent to -having an alpha mask specify total opaqueness everywhere. +This option names a file that contains the transparency mask. If you don't +specify this option, there is no transparency mask, which is equivalent to +having a transparency mask specify total opaqueness everywhere. <p> -You can specify <b>-</b> as the value of this option and the alpha +You can specify <b>-</b> as the value of this option and the transparency mask will come from Standard Input. If you do this, don't specify Standard Input as the source of any other input image. <DT><B>-invert</B> <DD> -This option inverts the sense of the values in the alpha mask, which +This option inverts the sense of the values in the transparency mask, which effectively switches the roles of the overlay image and the underlying image in places where the two intersect. @@ -209,8 +209,8 @@ 1.0 meaning the overlay image is totally opaque and 0.0 meaning it is totally transparent. The default is 1.0. -<p>If you specify an alpha mask (the <b>-alpha</b> option), -<b>pamcomp</b> uses the product of the opacity indicated by the alpha +<p>If you specify a transparency mask (the <b>-alpha</b> option), +<b>pamcomp</b> uses the product of the opacity indicated by the transparency mask (as modified by the <b>-invert</b> option, as a fraction, and this opacity value. The <b>-invert</b> option does not apply to this opacity value. @@ -261,10 +261,10 @@ <dd>This option indicates that the inputs are not true Netpbm images but rather a non-gamma-adjusted variation. This is relevant only when -you mix pixels, using the <b>-opacity</b> option or an alpha mask +you mix pixels, using the <b>-opacity</b> option or a transparency mask (the <b>-alpha</b> option). -<p>The alpha mask and <b>-opacity</b> values indicate a fraction of +<p>The transparency mask and <b>-opacity</b> values indicate a fraction of the light intensity of a pixel. But the PNM and PNM-equivalent PAM image formats represent intensities with gamma-adjusted numbers that are not linearly proportional to intensity. So <b>pamcomp</b>, by @@ -310,7 +310,7 @@ <p><B><A HREF="ppmcolormask.html">ppmcolormask</A></B> and <B><A HREF="pbmmask.html">pbmmask</A></B>, and <a href="pambackground.html"><b>pambackground</b></a> can help with -generating an alpha mask. +generating a transparency mask. <p><B><A HREF="pnmcomp.html">pnmcomp</A></B> is an older program that runs faster, but has less function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamcrater.html new/netpbm.sourceforge.net/doc/pamcrater.html --- old/netpbm.sourceforge.net/doc/pamcrater.html 2014-09-04 04:32:25.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pamcrater.html 2014-11-03 18:16:11.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pamcrater User Manual</TITLE></HEAD> <BODY> <H1>pamcrater</H1> -Updated: 04 September 2014 +Updated: 03 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -37,9 +37,9 @@ <p>This program is part of <a href="index.html">Netpbm</a>. -<P><B>pamcrater</B> creates a PAM image which is a terrain map of cratered -terrain. The terrain is as if a given number of impacts into a surface create -craters with random position and size. +<P><B>pamcrater</B> creates a PAM image which is a terrain map (not a visual +image) of cratered terrain. The terrain is as if a given number of impacts +into a surface create craters with random position and size. <p>The size distribution of the craters is based on a power law which results in many more small craters than large ones. The number of craters of a given @@ -74,6 +74,8 @@ <p>Larger craters should really use this profile, including the central peak, and totally obliterate the pre-existing terrain. +<p>The maxval of the PAM image is always 65535. + <p>The randomness in the image is limited before Netpbm 10.37 (December 2006) -- if you run the program twice in the same second, you may get identical output. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pammosaicknit.html new/netpbm.sourceforge.net/doc/pammosaicknit.html --- old/netpbm.sourceforge.net/doc/pammosaicknit.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pammosaicknit.html 2014-09-10 21:39:22.000000000 +0200 @@ -1,5 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml";> <head> <title>Pammosaicknit User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pampaintspill.html new/netpbm.sourceforge.net/doc/pampaintspill.html --- old/netpbm.sourceforge.net/doc/pampaintspill.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pampaintspill.html 2014-09-10 18:46:46.000000000 +0200 @@ -121,10 +121,8 @@ <h2 id="copyright">COPYRIGHT</h2> -<p>Copyright © 2010 Scott Pakin, <a href= -"mailto:[email protected]";><i>[email protected]</i></a>.</p> - -<hr /> +<p>Copyright © 2010 Scott Pakin, +<a href="mailto:[email protected]";><i>[email protected]</i></a>. <h2 id="index">Table Of Contents</h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamrgbatopng.html new/netpbm.sourceforge.net/doc/pamrgbatopng.html --- old/netpbm.sourceforge.net/doc/pamrgbatopng.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamrgbatopng.html 2014-11-15 04:25:35.000000000 +0100 @@ -27,7 +27,7 @@ tuple type (a color visual image with transparency) and produces an equivalent PNG image as output. -<p>The input image if from the file named by the <i>pamfile</i> argument, +<p>The input image is from the file named by the <i>pamfile</i> argument, or Standard Input if you don't specify <i>pamfile</i>. The output goes to Standard Output. @@ -41,7 +41,7 @@ it considerably less convenient to use. <p>(But note that <b>pnmtopng</b> takes PAM images, even with RGB_ALPHA -tuple type just fine -- it just ignores the alpha plane). +tuple type just fine -- it just ignores the transparency plane). <p>Netpbm's strategic direction is to add to <b>pnmtopng</b> all the capabilities of <b>pamrgbatopng</b> and retire <b>pamrgbatopng</b>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamthreshold.html new/netpbm.sourceforge.net/doc/pamthreshold.html --- old/netpbm.sourceforge.net/doc/pamthreshold.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamthreshold.html 2014-11-15 04:39:04.000000000 +0100 @@ -37,12 +37,12 @@ <p>The input should be a PGM image or a PAM image of tuple type GRAYSCALE or GRAYSCALE_ALPHA. However, pamthreshold doesn't check; it just thresholds the first channel as if it were grayscale samples and -if there is a second channel, processes it as if it is an alpha -(transparency) channel. So if you feed it e.g. a PPM image, it will +if there is a second channel, processes it as if it is a transparency +(alpha) channel. So if you feed it e.g. a PPM image, it will work but produce probably useless results. <p>The output is a PAM with tuple type BLACKANDWHITE or -BLACKANDWHITE_ALPHA, depending on whether the input has an alpha +BLACKANDWHITE_ALPHA, depending on whether the input has a transparency channel. You can turn this into a PBM (if you need to use it with an older program that doesn't understand PAM, or you can't afford the 8X amount of space that PAM uses for the image) with @@ -50,14 +50,14 @@ <p>The output is to Standard Output. -<P>When the input has an alpha channel, <b>pamthreshold</b> includes -an alpha channel in the output. Since the output has maxval 1, the -alpha channel can indicate only fully transparent or fully opaque. +<P>When the input has a transparency channel, <b>pamthreshold</b> includes +a transparency channel in the output. Since the output has maxval 1, the +transparency channel can indicate only fully transparent or fully opaque. <b>pamthreshold</b> make it fully transparent where the input is more than half transparent and fully opaque where it isn't. -<p>The alpha function was new in Netpbm 10.43 (June 2008). Before -that, <b>pamthreshold</b> ignores any alpha channel in the input. +<p>The transparency function was new in Netpbm 10.43 (June 2008). Before +that, <b>pamthreshold</b> ignores any transparency channel in the input. <p>Another way to convert a grayscale image to black and white is to dither. Dithering is using clustered black and white pixels such that diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtoavs.html new/netpbm.sourceforge.net/doc/pamtoavs.html --- old/netpbm.sourceforge.net/doc/pamtoavs.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtoavs.html 2014-09-10 18:49:35.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"> <head> <title>Pamtoavs User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtogif.html new/netpbm.sourceforge.net/doc/pamtogif.html --- old/netpbm.sourceforge.net/doc/pamtogif.html 2013-12-08 00:58:33.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtogif.html 2014-11-15 04:38:27.000000000 +0100 @@ -64,7 +64,9 @@ <p>The GIF format is not capable of representing an image with more than 256 colors in it (it contains a color map with a maximum size of 256). If the image you want to convert has more colors than that (<b>ppmhist</b> -can tell you), you can use <b>pnmquant</b> to reduce it to 256. +can tell you), you can use <b>pnmquant</b> to reduce it to 256. Or +use the more complex but faster method described under the <b>-mapfile</b> +option. <p>If your input image is a PAM with transparency information, <b>ppmtogif</b> uses one entry in the GIF colormap specifically for the transparent pixels, @@ -121,10 +123,29 @@ <p>The map file's depth must match the number of color components in the input (which is not necessarily the same as the input's depth -- -the input might have an alpha plane in addition). If your map file +the input might have a transparency plane in addition). If your map file does not, or it <em>might</em> not, run your input through <b>pnmremap</b> using the same map file so that it does. +<p>You can use <b>-mapfile</b> to speed up conversion of an image where you +already have a map file because of earlier processing of your image. For +example, it is common to start with an image that has more than 256 colors +and remap its colors to a set of 256 colors so that <b>pamgtogif</b> can +convert it (a GIF can have only 256 colors; <b>pamtogif</b> without +<b>-mapfile</b> fails on any image that has more than that) with +<b>pnmquant</b>. When you do this, <b>pnmquant</b> generates a palette to do +the color quantization, then <b>pamtogif</b> generates an identical palette +from the quantized image. You can save computation by generating the palette +once: + +<pre> +<kbd> + $ pnmcolormap 256 myimage.ppm >/tmp/colormap.ppm + $ pamtogif myimage.ppm -mapfile=/tmp/colormap.ppm >output.gif +</kbd> +</pre> + + <DT><B>-transparent=</B><I>color</I> <DD> @@ -161,9 +182,9 @@ a transparency (alpha) plane, so one used this option to supply a transparency plane as a separate PGM file. - This option names a PGM file that contains an alpha mask for the + This option names a PGM file that contains a transparency mask for the image. <B>pamtogif</B> creates fully transparent pixels wherever the -alpha mask indicates transparency greater than 50%. The color of +transparency mask indicates transparency greater than 50%. The color of those pixels is that specified by the <B>-alphacolor</B> option, or black by default. @@ -172,7 +193,7 @@ marks that colormap entry as transparent and uses that colormap index in the output image to create a transparent pixel. -<P> The alpha image must be the same dimensions as the input +<P> The transparency image must be the same dimensions as the input image, but may have any maxval. White means opaque and black means transparent. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtooctaveimg.html new/netpbm.sourceforge.net/doc/pamtooctaveimg.html --- old/netpbm.sourceforge.net/doc/pamtooctaveimg.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtooctaveimg.html 2014-09-10 18:49:28.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"> <head> <title>Pamtooctaveimg User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtosrf.html new/netpbm.sourceforge.net/doc/pamtosrf.html --- old/netpbm.sourceforge.net/doc/pamtosrf.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtosrf.html 2014-09-10 18:49:23.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"> <head> <title>Pamtosrf User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtotga.html new/netpbm.sourceforge.net/doc/pamtotga.html --- old/netpbm.sourceforge.net/doc/pamtotga.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtotga.html 2014-11-15 04:37:55.000000000 +0100 @@ -32,9 +32,9 @@ produces a TrueVision Targa file as output. The PAM image may be either a BLACKANDWHITE, GRAYSCALE, RGB, or RGB_ALPHA image. -<p>To create a TGA image with transparency (i.e. with an alpha mask), +<p>To create a TGA image with transparency (i.e. with a transparency mask), use RGB_ALPHA PAM input. Some Netpbm programs that generate images with -alpha masks generate them in that format. For another way to create +transparency masks generate them in that format. For another way to create the proper input stream, see <a href="pamstack.html"><b>pamstack</b></a>. <p>It is unclear that anything except <b>pamtotga</b> knows about TGAs @@ -102,11 +102,11 @@ That was always a misnomer, though, because a PPM class program would not be able to tell the difference between PGM and PPM input (it would all look like PPM), and thus could not choose the output Targa image type based on the type -of the input. Netpbm 10.6 also added the ability to handle an alpha channel, -so it became a PAM class program. +of the input. Netpbm 10.6 also added the ability to handle a transparency +channel, so it became a PAM class program. <p>In Netpbm 10.15 (April 2003), the program became the first in the -Netpbm package to recognize an alpha channel in a PAM. It recognized +Netpbm package to recognize a transparency channel in a PAM. It recognized tuple type "RGBA". But when this kind of PAM image was later added to the PAM specification, it was specified with tuple type "RGB_ALPHA". So in Netpbm 10-26 (January 2005), <b>pamtotga</b> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtouil.html new/netpbm.sourceforge.net/doc/pamtouil.html --- old/netpbm.sourceforge.net/doc/pamtouil.html 2013-05-29 03:34:18.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pamtouil.html 2014-11-15 04:37:22.000000000 +0100 @@ -8,7 +8,7 @@ <A NAME="lbAB"> </A> <H2>NAME</H2> -pamtouil - convert a PNM or PNM/alpha image into a Motif UIL icon file +pamtouil - convert a PNM or PNM/transparency image into a Motif UIL icon file <A NAME="lbAC"> </A> <H2>SYNOPSIS</H2> @@ -25,11 +25,11 @@ <p>This program is part of <a href="index.html">Netpbm</a>. -<p><b>pamtouil</b> reads a PNM or PAM image as input and produces a -Motif UIL icon file as output. If the input is PAM, it may be either -a regular grayscale or color image or grayscale+alpha or color+alpha. -Where the alpha channel is present, <b>pamtouil</b> renders pixels -that are more than half transparent as transparent in the output. +<p><b>pamtouil</b> reads a PNM or PAM image as input and produces a Motif UIL +icon file as output. If the input is PAM, it may be either a regular +grayscale or color image or grayscale+transparency or color+transparency. +Where the transparency channel is present, <b>pamtouil</b> renders pixels that +are more than half transparent as transparent in the output. <P>In the UIL's colormap, <b>pamtouil</b> uses the color names from the RGB database -- the same one <b><a href="ppmmake.html">ppmmake</a></b> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtowinicon.html new/netpbm.sourceforge.net/doc/pamtowinicon.html --- old/netpbm.sourceforge.net/doc/pamtowinicon.html 2013-09-03 22:01:15.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pamtowinicon.html 2014-11-15 04:37:00.000000000 +0100 @@ -85,10 +85,11 @@ <TABLE summary="Image type based on number of channels" border=1 align="center"> <TR><TH>channels</TH><TH>image</TH></TR> <TR><TD>1</TD><TD>fully opaque grayscale image</TD></TR> -<TR><TD>2</TD><TD>grayscale image with alpha channel</TD></TR> +<TR><TD>2</TD><TD>grayscale image with transparency channel</TD></TR> <TR><TD>3</TD><TD>fully opaque color image</TD></TR> -<TR><TD>4</TD><TD>color image with alpha channel</TD></TR> -<TR><TD>5</TD><TD>color image with alpha channel and additional AND mask</TD></TR> +<TR><TD>4</TD><TD>color image with transparency channel</TD></TR> +<TR><TD>5</TD><TD>color image with transparency channel and additional AND +mask</TD></TR> </TABLE> <P>The tuple types of the PAMs are irrelevant. @@ -98,13 +99,13 @@ The so-called ‘AND mask’ is a special feature of Microsoft Windows icons. It is required for all BMP encoded images. At the -first sight, the AND mask is a 1-bit alpha channel, but it is also +first sight, the AND mask is a 1-bit transparency channel, but it is also used for e.g. shading the icon while dragging. See <A HREF="winicon.html">Windows Icons</A> for details. <P>If there is no explicit AND mask, but transparency data in the input image, <B>pamtowinicon</B> sets the AND mask to opaque where the -sample in the alpha channel is below maxval, and to transparent +sample in the transparency channel is below maxval, and to transparent elsewhere. <P>If no transparency data is present in the input image, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pbmtext.html new/netpbm.sourceforge.net/doc/pbmtext.html --- old/netpbm.sourceforge.net/doc/pbmtext.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pbmtext.html 2014-11-15 04:36:37.000000000 +0100 @@ -159,10 +159,10 @@ <P>If you want to overlay colored text instead of black, just use <B>ppmchange</B> to change all black pixels to the color of your choice before overlaying the text image. But still use the original -black and white image for the alpha mask. +black and white image for the transparency mask. <P>If you want the text at an angle, use <B>pnmrotate</B> on the text -image (and alpha mask) before overlaying. +image (and transparency mask) before overlaying. <h2 id="fonts">FONTS</h2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pngtopam.html new/netpbm.sourceforge.net/doc/pngtopam.html --- old/netpbm.sourceforge.net/doc/pngtopam.html 2013-12-23 01:08:35.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pngtopam.html 2014-11-15 04:36:15.000000000 +0100 @@ -64,7 +64,7 @@ <DT><B>-alphapam</B> <DD>Produce a single output image containing the main image (foreground) -and the alpha channel or transparency mask. This image is in the PAM +and the transparency channel or transparency mask. This image is in the PAM format with tuple type of either GRAYSCALE_ALPHA (which has a depth of 2 channels) or RGB_ALPHA (which has a depth of 4 channels). @@ -80,7 +80,7 @@ <DT><B>-alpha</B> -<DD>Output the alpha channel or transparency mask of the image. The +<DD>Output the transparency channel or transparency mask of the image. The result is either a PBM file or a PGM file, depending on whether different levels of transparency appear. @@ -92,7 +92,7 @@ <DT><B>-mix</B> -<DD>Compose the image with the transparency or alpha mask against a +<DD>Compose the image with the transparency or transparency mask against a background. The background color is determined by the bKGD chunk in the PNG, except that you can override it with <b>-background</b>. If the PNG has no bKGD chunk and you don't specify <b>-background</b>, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pngtopnm.html new/netpbm.sourceforge.net/doc/pngtopnm.html --- old/netpbm.sourceforge.net/doc/pngtopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pngtopnm.html 2014-11-15 04:35:45.000000000 +0100 @@ -35,7 +35,7 @@ href="pngtopam.html"><b>pngtopam</b></a>, introduced with Netpbm 10.44 (September 2008). <b>pngtopam</b> is backward compatible with <b>pngtopnm</b>, plus adds many additional functions, including the -ability to produce a PAM image that includes an alpha (transparency) +ability to produce a PAM image that includes a transparency (alpha) channel. Starting in Release 10.48, <b>pngtopnm</b> is just an alias for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnminterp.html new/netpbm.sourceforge.net/doc/pnminterp.html --- old/netpbm.sourceforge.net/doc/pnminterp.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnminterp.html 2014-11-15 04:35:36.000000000 +0100 @@ -14,7 +14,7 @@ <b><a href="pamstretch.html">pamstretch</a></b>. <P><B>pamstretch</b> is backward compatible with <b>pnminterp</b>, but -also recognizes PAM input, including that with an alpha channel. +also recognizes PAM input, including that with a transparency channel. </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmmargin.html new/netpbm.sourceforge.net/doc/pnmmargin.html --- old/netpbm.sourceforge.net/doc/pnmmargin.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmmargin.html 2014-11-12 04:41:20.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pnmmargin User Manual</TITLE></HEAD> <BODY> <H1>pnmmargin</H1> -Updated: 20 March 2009 +Updated: 12 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -22,11 +22,22 @@ <p><b>pnmmargin</b> adds a border around a PNM image. + +<H2 id="arguments">ARGUMENTS</H2> + +<p><i>pnmfile</i> is the name of the input file. If you don't specify this +argument, <b>pnmmargin</b> reads the input image from its Standard Input. + + <H2 id="options">OPTIONS</H2> <P>You can specify the border color with the <B>-white</B>, -<B>-black</B>, and <B>-color</B> options. If no color is specified, -the program makes a guess. +<B>-black</B>, and <B>-color</B> options. If you don't specify a color, the +program makes a guess. + +<p>The value of <b>-color</b> is like the +<a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. <P>To remove a border of a specified size from an image, use <B>pamcut</B>. <b>pnmcrop</b> also removes borders, but determines by itself @@ -41,6 +52,7 @@ <p><b>pnmpad</b> does essentially the same thing, but gives you more control over the individual margins and does only black and white margins. + <H2 id="seealso">SEE ALSO</H2> <A HREF="pamcut.html">pamcut</A> @@ -58,6 +70,7 @@ <UL> <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> +<LI><A HREF="#arguments">ARGUMENTS</A> <LI><A HREF="#options">OPTIONS</A> <LI><A HREF="#seealso">SEE ALSO</A> <LI><A HREF="#author">AUTHOR</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmpaste.html new/netpbm.sourceforge.net/doc/pnmpaste.html --- old/netpbm.sourceforge.net/doc/pnmpaste.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmpaste.html 2014-11-15 04:35:23.000000000 +0100 @@ -51,7 +51,7 @@ <P><B>pamcomp</B> is a more general tool, except that it lacks the "or," "and," and "xor" functions. -<B>pamcomp</B> allows you to specify an alpha mask in order to have +<B>pamcomp</B> allows you to specify a transparency mask in order to have only part of the inserted image get inserted. So the inserted pixels need not be a rectangle. You can also have the inserted image be translucent, so the resulting image is a mixture of the inserted image diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmremap.html new/netpbm.sourceforge.net/doc/pnmremap.html --- old/netpbm.sourceforge.net/doc/pnmremap.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmremap.html 2014-11-14 05:04:42.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pnmremap User Manual</TITLE></HEAD> <BODY> <H1>pnmremap</H1> -Updated: 03 June 2009 +Updated: 13 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -24,7 +24,7 @@ [<B>-verbose</B>] -[<B>-missingcolor=</B><I>color</I>] +[<B>-missingcolor=</B><I>colorspec</I>] [<I>pnmfile</I>] @@ -250,13 +250,17 @@ <P>If you specify <B>-firstisdefault</B>, the maxval of your input must match the maxval of your palette image. -<DT><B>-missingcolor=</B><I>color</I> +<DT><B>-missingcolor=</B><I>colorspec</I> <DD>This specifies the default color for <b>pnmremap</b> to map to a color in the input image that isn't in the palette. <I>color</I> may or may not be in the palette image; it is part of the palette regardless. +<P><i>colorspec</i> is as described for +the <a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. + <P>If you specify <B>-missingcolor</B>, the maxval of your input must match the maxval of your palette image. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmtopalm.html new/netpbm.sourceforge.net/doc/pnmtopalm.html --- old/netpbm.sourceforge.net/doc/pnmtopalm.html 2013-05-29 03:34:18.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pnmtopalm.html 2014-11-14 05:18:00.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Pnmtopalm User Manual</TITLE></HEAD> <BODY> <H1>pnmtopalm</H1> -Updated: 05 October 2003 +Updated: 14 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -21,7 +21,7 @@ [<B>-colormap</B>] -[<B>-transparent=</B><I>color</I>] +[<B>-transparent=</B><I>colorspec</I>] [<B>-density=</B><i>N</i>] @@ -187,16 +187,16 @@ not recommended by Palm, for efficiency reasons. Otherwise, <B>pnmtopalm</B> uses the default Palm colormap for color output. -<DT><B>-transparent=</B><I>color</I> +<DT><B>-transparent=</B><I>colorspec</I> <DD> +Marks <EM>one</EM> particular color as fully transparent. -Marks <EM>one</EM> particular color as fully transparent. The format -to specify the color is either (when for example orange) -"1.0,0.5,0.0", where the values are floats between zero and -one, or with the syntax "#RGB", "#RRGGBB" or -"#RRRRGGGGBBBB" where R, G and B are hexadecimal numbers. -Transparency works only on Palm OS 3.5 and higher. +<p><i>colorspec</i> is as described for the +<a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. + +<p>Transparency works only on Palm OS 3.5 and higher. <DT><B>-scanline-compression</B> <DD> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmtopng.html new/netpbm.sourceforge.net/doc/pnmtopng.html --- old/netpbm.sourceforge.net/doc/pnmtopng.html 2013-04-24 00:25:04.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/pnmtopng.html 2014-11-15 04:35:16.000000000 +0100 @@ -144,12 +144,12 @@ Creates an interlaced PNG file (Adam7). <DT><B>-alpha=</b><i>filename</i> -<DD> This specifies the transparency (alpha channel) of the image. -You supply the alpha channel as a standard PGM alpha mask (see the <a -href="pgm.html">PGM</a> specification. <b>pnmtopng</b> does not -necessarily represents the transparency information as an alpha channel in -the PNG format. If it can represent the transparency information through -a palette, it will do so in order to make a smaller PNG file. +<DD> This specifies the transparency (alpha) channel of the image. You supply +the transparency channel as a standard PGM transparency mask (see +the <a href="pgm.html">PGM</a> specification. <b>pnmtopng</b> does not +necessarily represents the transparency information as a transparency channel +in the PNG format. If it can represent the transparency information through a +palette, it will do so in order to make a smaller PNG file. <b>pnmtopng</b> even sorts the palette so it can omit the opaque colors from the transparency part of the palette and save space for the palette. @@ -183,7 +183,7 @@ <DT><B>-background=</b><i>color</i> <DD> Causes <b>pnmtopng</b> to create a background color chunk in the PNG output -which can be used for subsequent alpha channel or transparent color +which can be used for subsequent transparency channel or transparent color conversions. Specify <i>color</i> the same as for <b>-transparent</b>. <DT><B>-palette=</b><i>palettefile</i> @@ -440,11 +440,11 @@ <DT><B>-force</B> <DD> -When you specify this, <b>pnmtopng</b> limits its optimizations. -The resulting PNG output is as similar to the Netpbm input as possible. -For example, the PNG output will not be paletted and the alpha channel -will be represented as a full alpha channel even if the information could -be represented more succinctly with a transparency chunk. +When you specify this, <b>pnmtopng</b> limits its optimizations. The +resulting PNG output is as similar to the Netpbm input as possible. For +example, the PNG output will not be paletted and the transparency channel will +be represented as a full transparency channel even if the information could be +represented more succinctly with a transparency chunk. <DT><B>-libversion</B> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmtorle.html new/netpbm.sourceforge.net/doc/pnmtorle.html --- old/netpbm.sourceforge.net/doc/pnmtorle.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/pnmtorle.html 2014-11-15 04:34:28.000000000 +0100 @@ -27,7 +27,7 @@ <p>This program is part of <a href="index.html">Netpbm</a>. <p>This program converts Netpbm image files into Utah RLE image files. -You can include an alpha mask. If the input is a multiple image file, +You can include a transparency mask. If the input is a multiple image file, the output consists of several concatenated RLE images. <P>The RLE file will contain either a three channel color image (24 @@ -58,10 +58,10 @@ <DT><B>-a</B> <DD> -This option causes <b>pnmtorle</b> to include an alpha channel in the output -image. The alpha channel is based on the image: Wherever a pixel -is black, the corresponding alpha value is transparent. Everywhere -else, the alpha value is fully opaque. +This option causes <b>pnmtorle</b> to include an transparency channel in the +output image. The transparency channel is based on the image: Wherever a +pixel is black, the corresponding trasparency value is transparent. +Everywhere else, the transparency value is fully opaque. <DT><B>-o</B> <I>outfile</I> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmcolormask.html new/netpbm.sourceforge.net/doc/ppmcolormask.html --- old/netpbm.sourceforge.net/doc/ppmcolormask.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmcolormask.html 2014-11-15 04:34:01.000000000 +0100 @@ -43,11 +43,11 @@ color indicated by the <b>-color</b> option, and white everywhere else. -<P>The output of <B>ppmcolormask</B> is useful as an alpha mask input -to <B>pamcomp</B>. Note that you can generate such an alpha mask -automatically as you convert to PNG format with <B><A -HREF="pnmtopng.html">pnmtopng</A></B>. Use its <B>-transparent</B> -option. +<P>The output of <B>ppmcolormask</B> is useful as a transparency mask input +to <B>pamcomp</B>. Note that you don't need <b>ppmcolormask</b> and +<b>pamcomp</b> if you are ultimately converting to PNG with +<b>pnmtopng</b> because the <b>-transparent</b> option on <b>pnmtopng</b> does +the same thing. <P><I>ppmfile</I> is the input file. If you don't specify <I>ppmfile</I>, the input is from Standard Input. @@ -112,6 +112,7 @@ <B><A HREF="pgmtoppm.html">pgmtoppm</A></B>, <B><A HREF="pamcomp.html">pamcomp</A></B>, <B><A HREF="pbmmask.html">pbmmask</A></B>, +<B><A HREF="pnmtopng.html">pbmmask</A></B>, <B><A HREF="ppm.html">ppm</A></B> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmdraw.html new/netpbm.sourceforge.net/doc/ppmdraw.html --- old/netpbm.sourceforge.net/doc/ppmdraw.html 2014-03-18 02:30:21.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmdraw.html 2014-11-14 05:06:32.000000000 +0100 @@ -150,6 +150,10 @@ in which subsequent drawing commands draw. Before the first <b>setcolor</b>, the current color is white. +<P>There is one argument. It specifies the color as described for the +<a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. + <dt>setfont <dd>This sets the "current font", which determines the font diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmmix.html new/netpbm.sourceforge.net/doc/ppmmix.html --- old/netpbm.sourceforge.net/doc/ppmmix.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmmix.html 2014-11-15 04:33:53.000000000 +0100 @@ -40,7 +40,7 @@ <P><B>pamcomp</B> is a more general alternative. It allows you to mix images of different size and to have the fade factor vary throughout -the image (through the use of an alpha mask). It does not have the +the image (through the use of a transparency mask). It does not have the same-maxval and same-type restrictions. It mixes light intensity, not brightness. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmrainbow.html new/netpbm.sourceforge.net/doc/ppmrainbow.html --- old/netpbm.sourceforge.net/doc/ppmrainbow.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmrainbow.html 2014-11-15 04:33:46.000000000 +0100 @@ -2,7 +2,7 @@ <HTML><HEAD><TITLE>Ppmrainbow User Manual</TITLE></HEAD> <BODY> <H1>ppmrainbow</H1> -Updated: 09 December 2009 +Updated: 12 November 2014 <BR> <A HREF="#index">Table Of Contents</A> @@ -25,16 +25,13 @@ <p>This program is part of <a href="index.html">Netpbm</a>. <B>ppmrainbow</B> generates a PPM image that fades from one color to -another to another from left to right, like a rainbow. The colors are -those you specify on the command line, in that order. The first color -is added again on the right end of the image unless you specify the -<b>-norepeat</b> option. +another to another from left to right, like a rainbow. <P>If you want a vertical or other non-horizontal rainbow, run the output through <B>pnmrotate</B> or <b>pamflip</b>. <P>One use for such a rainbow is to compose it with another image -under an alpha mask in order to add a rainbow area to another image. +under a transparency mask in order to add a rainbow area to another image. In fact, you can make rainbow-colored text by using <B>pbmtext</B>, <B>pamcomp</B>, and <B>ppmrainbow</B>. @@ -43,6 +40,21 @@ <p>If you just want an image containing all the possible colors (for some kind of processing; not to look at), see <b>pamseq</b>. + +<h2 id="arguments">ARGUMENTS</h2> + +<P><I>color</I> ... is the list of colors, in order from left to right, +to go into the rainbow. + +<p>The first color is added again on the right end of the image unless you +specify the <b>-norepeat</b> option. This means you can concatenate multiple +copies (tile, as with <b>pnmtile</b>) to make a continuous larger image. + +<P><i>color</i> is as described for +the <a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. + + <H2 id="options">OPTIONS</H2> <P>All options can be abbreviated to their shortest unique prefix. @@ -70,8 +82,7 @@ <dd>This option makes <b>ppmrainbow</b> end the rainbow with the last color you specify. Without this option, <b>ppmrainbow</b> adds the first color you specify to the right end of the rainbow as if you had -repeated it. <i>(I don't understand the point of this default behavior; -it exists today just for backward compatibility).</i> +repeated it. <DT><B>-tmpdir</B> @@ -111,6 +122,7 @@ <UL> <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> +<LI><A HREF="#options">ARGUMENTS</A> <LI><A HREF="#options">OPTIONS</A> <LI><A HREF="#seealso">SEE ALSO</A> <LI><A HREF="#author">AUTHOR</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmrough.html new/netpbm.sourceforge.net/doc/ppmrough.html --- old/netpbm.sourceforge.net/doc/ppmrough.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmrough.html 2014-11-15 04:33:40.000000000 +0100 @@ -25,9 +25,9 @@ [<B>-height </B><I>pixels</I>] -[<B>-bg </B><I>rgb:##/##/##</I>] +[<B>-bg </B><I>colorspec</I>] -[<B>-fg </B><I>rgb:##/##/##</I>] +[<B>-fg </B><I>colorspec</I>] [<B>-var </B><I>pixels</I>] @@ -78,7 +78,7 @@ option. <P>You could use <b>ppmrough</b> with <b>ppmtopgm</b> to create a PGM -alpha mask and use it to roughen up the edges of another image. +transparency mask and use it to roughen up the edges of another image. <H2 id="options">OPTIONS</H2> @@ -111,15 +111,17 @@ <DD>Specifies the height of the image (default: 100). -<DT><B>-bg=</B><I>color</I> +<DT><B>-bg=</B><I>colorspec</I> -<DD>Background color. Specify this the same way you specify a color with - <b>ppmmake</b>. Default is black. +<DD>Background color. <i>colorspec</i> is as described for the +<a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. Default is black. <DT><B>-fg=</B><I>color</I> -<DD>Foreground color. Specify this the same way you specify a color with - <b>ppmmake</b>. Default is white. +<DD>Foreground color. <i>colorspec</i> is as described for the +<a href="libppm.html#colorname">argument of the <b>ppm_parsecolor()</b> +library routine</a>. Default is white. <DT><B>-var=</B><I>pixels</I> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmtotga.html new/netpbm.sourceforge.net/doc/ppmtotga.html --- old/netpbm.sourceforge.net/doc/ppmtotga.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmtotga.html 2014-11-15 04:33:27.000000000 +0100 @@ -14,7 +14,7 @@ <b><a href="pamtotga.html">pamtotga</a></b>. <P><B>pamtotga</b> is backward compatible with <b>ppmtotga</b>, but -also recognizes PAM input, including that with an alpha channel. +also recognizes PAM input, including that with a transparency channel. </BODY> </HTML> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmtowinicon.html new/netpbm.sourceforge.net/doc/ppmtowinicon.html --- old/netpbm.sourceforge.net/doc/ppmtowinicon.html 2013-04-15 01:59:57.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/ppmtowinicon.html 2014-11-15 04:33:20.000000000 +0100 @@ -62,7 +62,7 @@ as with any Netpbm program, you can use a PBM image for the transparency mask and <b>ppmtowinicon</b> will treat it like a PGM. -<P>The and mask is like an alpha mask, except for what it signifies in +<P>The and mask is like a transparency mask, except for what it signifies in the "not opaque" areas. In the usual case, the foreground image is black in those areas, and in that case the areas are fully transparent -- the background shows through the icon. But in general, a not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ppmtoxpm.html new/netpbm.sourceforge.net/doc/ppmtoxpm.html --- old/netpbm.sourceforge.net/doc/ppmtoxpm.html 2013-12-08 01:05:33.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmtoxpm.html 2014-11-15 04:33:03.000000000 +0100 @@ -62,17 +62,16 @@ <p>All color codes in an image are the same length, and <b>ppmtoxpm</b> tries to make it as short as possible. That length is, of course, determined by the number of colors in the image. -<b>ppmtoxpm</b> counts the colors in the image, excluding those that -will be transparent in the output because of your alpha mask, and chooses -a color code length accordingly. There are 92 printable characters -that can be used in a color code. Therefore, if you have 92 or fewer -colors, your color codes will be one character. If you have more than -92 but not more than 92 * 92, your color codes will be two characters. -And so on. +<b>ppmtoxpm</b> counts the colors in the image, excluding those that will be +transparent in the output because of your transparency mask, and chooses a +color code length accordingly. There are 92 printable characters that can be +used in a color code. Therefore, if you have 92 or fewer colors, your color +codes will be one character. If you have more than 92 but not more than 92 * +92, your color codes will be two characters. And so on. -<p>There's one exception to the above: If you specify an alpha mask +<p>There's one exception to the above: If you specify a transparency mask (the <b>-alpha</b> option, one unique color code represents -"transparent." This is true even if the alpha mask doesn't +"transparent." This is true even if the transparency mask doesn't actually produce any transparent pixels. So subtract one from the number of possible colors if you use <b>-alpha</b>. @@ -114,15 +113,15 @@ <DT><B>-alphamask=</B><I>pgmfile</I> -<DD> This option names a PGM file to use as an alpha (transparency) +<DD> This option names a PGM file to use as a transparency (alpha) mask. The file must contain an image the same dimensions as the input image. <B>ppmtoxpm</B> marks as transparent any pixel whose position -in the alpha mask image is at most half white. +in the transparency mask image is at most half white. <P>If you don't specify <B>-alphamask</B>, <B>ppmtoxpm</B> makes all pixels in the output opaque. -<P><B>ppmcolormask</B> is one way to generate an alpha mask file. You +<P><B>ppmcolormask</B> is one way to generate a transparency mask file. You might also generate it by extracting transparency information from an XPM file with the <B>-alphaout</B> option to <B>xpmtoppm</B>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/rlatopam.html new/netpbm.sourceforge.net/doc/rlatopam.html --- old/netpbm.sourceforge.net/doc/rlatopam.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/rlatopam.html 2014-11-15 04:32:21.000000000 +0100 @@ -22,7 +22,7 @@ <p><b>rlatopam</b> converts an Alias RLA (run-length encoded type A) or RPF (rich pixel format) image to a PAM image file. The output PAM -file can be grayscale or RGB, with or without an alpha channel. +file can be grayscale or RGB, with or without a transparency channel. <p><i>rlafile</i> is the file name of the input file. If you omit this parameter, <b>rlatopam</b> reads the image from Standard Input. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/rletopnm.html new/netpbm.sourceforge.net/doc/rletopnm.html --- old/netpbm.sourceforge.net/doc/rletopnm.html 2013-02-20 04:30:32.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/rletopnm.html 2014-11-15 04:32:04.000000000 +0100 @@ -45,18 +45,18 @@ <DD> <B>rletopnm </B> creates a PGM (portable graymap) file containing the -alpha channel values in the input image. If the input image doesn't -contain an alpha channel, the <I>alpha-filename</I> file contains all -zero (transparent) alpha values. If you don't specify -<B>--alphaout</B>, <B>rletopnm</B> does not generate an alpha file, -and if the input image has an alpha channel, <B>rletopnm</B> simply +transparency channel values in the input image. If the input image doesn't +contain an transparency channel, the <I>alpha-filename</I> file contains all +zero (transparent) transparency values. If you don't specify +<B>--alphaout</B>, <B>rletopnm</B> does not generate a transparency file, +and if the input image has a transparency channel, <B>rletopnm</B> simply discards it. <P>If you specify <B>-</B> as the filename, <B>rletopnm</B> writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. <P>See <B><A HREF="pamcomp.html">pamcomp</A></B> for one way to use -the alpha output file. +the transparency output file. <DT><B>--verbose</B> @@ -93,8 +93,8 @@ </pre> <li>Convert RLE file dart.rle to PPM format as dart.ppm. Store the -alpha channel of dart.rle as dartalpha.pgm (if dart.rle doesn't have -an alpha channel, store a fully transparent alpha mask as +transparency channel of dart.rle as dartalpha.pgm (if dart.rle doesn't have +a transparency channel, store a fully transparent transparency mask as dartalpha.pgm): <pre> @@ -129,12 +129,11 @@ <P>Modifications by Eric Haines to support raw and plain formats. -<P>Modifications by Bryan Henderson to create alpha files and use +<P>Modifications by Bryan Henderson to create transparency files and use mnemonic options. <HR> -<A NAME="index"> </A> -<H2>Table Of Contents</H2> +<H2 id="index">Table Of Contents</H2> <UL> <LI><A HREF="#synopsis">SYNOPSIS</A> <LI><A HREF="#description">DESCRIPTION</A> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/sgitopnm.html new/netpbm.sourceforge.net/doc/sgitopnm.html --- old/netpbm.sourceforge.net/doc/sgitopnm.html 2014-04-25 04:52:00.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/sgitopnm.html 2014-11-15 04:30:09.000000000 +0100 @@ -57,7 +57,7 @@ image or, if the input has 1 or 2 channels, extracts the first channel as a PGM image. -<p>A 2-channel image is grayscale plus alpha (transparency), so you can get +<p>A 2-channel image is grayscale plus transparency, so you can get the transparency information with <b>-channel=2</b>. You could then combine them into a PAM image of tuple type GRAYSCALE_ALPHA with <b>pamstack</b>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/srftopam.html new/netpbm.sourceforge.net/doc/srftopam.html --- old/netpbm.sourceforge.net/doc/srftopam.html 2013-05-29 03:34:19.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/srftopam.html 2014-09-10 18:49:18.000000000 +0200 @@ -1,4 +1,4 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"> <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en"> <head> <title>Srftopam User Manual</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/tgatoppm.html new/netpbm.sourceforge.net/doc/tgatoppm.html --- old/netpbm.sourceforge.net/doc/tgatoppm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/tgatoppm.html 2014-11-15 04:29:51.000000000 +0100 @@ -34,18 +34,18 @@ <DT><B>--alphaout=</B><I>alpha-filename</I> -<DD><B>tgatoppm </B> creates a PGM image containing the alpha channel +<DD><B>tgatoppm </B> creates a PGM image containing the transparency channel values in the input image. If the input image doesn't contain an -alpha channel, the <I>alpha-filename</I> file contains all zero -(transparent) alpha values. If you don't specify <B>--alphaout</B>, +transparency channel, the <I>alpha-filename</I> file contains all zero +(transparent) transparency values. If you don't specify <B>--alphaout</B>, <B>tgatoppm</B> does not generate an alpha file, and if the input -image has an alpha channel, <B>tgatoppm</B> simply discards it. +image has a transparency channel, <B>tgatoppm</B> simply discards it. <P>If you specify <B>-</B> as the filename, <B>tgatoppm</B> writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. <P>See <B><A HREF="pamcomp.html">pamcomp</A></B> for one way to use -the alpha output file. +the transparency output file. <DT><B>--headerdump</B> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/tifftopnm.html new/netpbm.sourceforge.net/doc/tifftopnm.html --- old/netpbm.sourceforge.net/doc/tifftopnm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/tifftopnm.html 2014-11-15 04:29:19.000000000 +0100 @@ -53,7 +53,7 @@ <P>This program cannot read every possible TIFF file -- there are myriad variations of the TIFF format. However, it does understand -monochrome and gray scale, RGB, RGBA (red/green/blue with alpha +monochrome and gray scale, RGB, RGBA (red/green/blue with transparency channel), CMYK (Cyan-Magenta-Yellow-Black ink color separation), and color palette TIFF files. An RGB file can have either single plane (interleaved) color or multiple plane format. The program reads 1-8 @@ -109,18 +109,18 @@ <DT><B>-alphaout=</B><I>alpha-filename</I> <DD><B>tifftopnm </B>creates a PGM file containing the alpha channel -values in the input image. If the input image doesn't contain an -alpha channel, the <I>alpha-filename</I> file contains all zero -(transparent) alpha values. If you don't specify <B>-alphaout</B>, +values in the input image. If the input image doesn't contain a +transparency channel, the <I>alpha-filename</I> file contains all zero +(transparent) transparency values. If you don't specify <B>-alphaout</B>, -<B>tifftopnm</B> does not generate an alpha file, and if the input -image has an alpha channel, <B>tifftopnm</B> simply discards it. +<B>tifftopnm</B> does not generate a transparency file, and if the input +image has an transparency channel, <B>tifftopnm</B> simply discards it. <P>If you specify <B>-</B> as the filename, <B>tifftopnm</B> -writes the alpha output to Standard Output and discards the image. +writes the transparency output to Standard Output and discards the image. <P>See <B><A HREF="pamcomp.html">pamcomp</A></B> for one way to use -the alpha output file. +the transparency output file. <DT><B>-respectfillorder</B> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/winicon.html new/netpbm.sourceforge.net/doc/winicon.html --- old/netpbm.sourceforge.net/doc/winicon.html 2013-09-03 22:02:48.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/winicon.html 2014-11-15 04:28:40.000000000 +0100 @@ -56,13 +56,13 @@ the image is usually black and sometimes white, but a color other than black and white will hardly give predictable results. -<P>Since Windows XP, there may also be an 8-bit alpha channel in 32-bpp BMP -encoded icon images. The AND mask, however, is still required and used +<P>Since Windows XP, there may also be an 8-bit transparency channel in 32-bpp +BMP encoded icon images. The AND mask, however, is still required and used e.g. for generating shadows. <P>PNG encoded images don't contain AND masks. While rendering a PNG encoded -image, Windows constructs an AND mask on the fly from the alpha channel, if -present. +image, Windows constructs an AND mask on the fly from the transparency +channel, if present. <H3 id="evolution">Evolution of Windows Icons</H3> @@ -76,7 +76,7 @@ <LI>Windows 4.0 (a.k.a. Windows95) added support for 32-bpp images and resolutions up to 256 by 256. <LI>NT 5.1 (a.k.a. Windows XP) added support for the 8-bit -alpha channel in the unused bits of 32-bpp images. +transparency channel in the unused bits of 32-bpp images. <LI>NT 6.0 (a.k.a. Windows Vista) added support for PNG encoded images </UL> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/winicontopam.html new/netpbm.sourceforge.net/doc/winicontopam.html --- old/netpbm.sourceforge.net/doc/winicontopam.html 2013-05-13 02:29:51.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/winicontopam.html 2014-11-15 04:28:21.000000000 +0100 @@ -31,9 +31,9 @@ <P><B>winicontopam</B> reads a Microsoft Windows icon file and converts it to one or more RGB_ALPHA Netpbm PAM files. -<P>The alpha channel is copied from the 8-bit transparency data from the icon, -if present. If no 8-bit transparency data is available, the alpha channel is -constructed from the so-called ‘AND mask’. +<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 +transparency channel is constructed from the so-called ‘AND mask’. <P>The output goes to Standard Output. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/ximtoppm.html new/netpbm.sourceforge.net/doc/ximtoppm.html --- old/netpbm.sourceforge.net/doc/ximtoppm.html 2013-02-20 04:30:31.000000000 +0100 +++ new/netpbm.sourceforge.net/doc/ximtoppm.html 2014-11-15 04:28:09.000000000 +0100 @@ -36,23 +36,23 @@ <DL COMPACT> <DT><B>--alphaout=</B><I>alpha-filename</I> -<DD><B>ximtoppm</B> creates a PGM file containing the alpha channel -values in the input image. If the input image doesn't contain an -alpha channel, the <I>alpha-filename</I> file contains all zero -(transparent) alpha values. If you don't specify <B>--alphaout</B>, -<B>ximtoppm</B> does not generate an alpha file, and if the input -image has an alpha channel, <B>ximtoppm</B> simply discards it. +<DD><B>ximtoppm</B> creates a PGM file containing the transparency channel +values in the input image. If the input image doesn't contain a +transparency channel, the <I>alpha-filename</I> file contains all zero +(transparent) transparency values. If you don't specify <B>--alphaout</B>, +<B>ximtoppm</B> does not generate a transparency file, and if the input +image has a transparency channel, <B>ximtoppm</B> simply discards it. <P>If you specify <B>-</B> as the filename, <B>ximtoppm</B> writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. <P>Actually, an Xim image can contain an arbitrary fourth channel -- -it need not be an Alpha channel. <B>ximtoppm</B> extracts any fourth -channel it finds as described above; it doesn't matter if it is an -alpha channel or not. +it need not be a transparency channel. <B>ximtoppm</B> extracts any fourth +channel it finds as described above; it doesn't matter if it is a +transparency channel or not. <P>See <B><A HREF="pamcomp.html">pamcomp</A></B> for one way to use -the alpha output file. +the transparency output file. </DL> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/doc/xpmtoppm.html new/netpbm.sourceforge.net/doc/xpmtoppm.html --- old/netpbm.sourceforge.net/doc/xpmtoppm.html 2013-05-29 03:34:19.000000000 +0200 +++ new/netpbm.sourceforge.net/doc/xpmtoppm.html 2014-11-15 04:27:04.000000000 +0100 @@ -34,16 +34,16 @@ <DD><B>xpmtoppm</B> creates a PBM file containing the transparency mask for the image. If the input image doesn't contain transparency information, the <I>alpha-filename</I> file contains all white -(opaque) alpha values. If you don't specify <B>--alphaout</B>, -<B>xpmtoppm</B> does not generate an alpha file, and if the input +(opaque) transparency values. If you don't specify <B>--alphaout</B>, +<B>xpmtoppm</B> does not generate a transparency file, and if the input image has transparency information, <B>xpmtoppm</B> simply discards it. <P>If you specify <B>-</B> as the filename, <B>xpmtoppm</B> writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. <P>See <B><A HREF="pamcomp.html">pamcomp</A></B> for one way to use -the alpha output file. +the transparency output file. <p><b>xpmtoppm</b> can't handle a line longer than 8K characters in the XPM input. If an input line exceeds this limit, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netpbm.sourceforge.net/getting_netpbm.php new/netpbm.sourceforge.net/getting_netpbm.php --- old/netpbm.sourceforge.net/getting_netpbm.php 2014-09-08 09:56:05.000000000 +0200 +++ new/netpbm.sourceforge.net/getting_netpbm.php 2014-11-18 17:13:09.000000000 +0100 @@ -365,7 +365,7 @@ </address> <p style="font-size:75%"> -This page was generated on 08 Sep 2014. +This page was generated on 18 Nov 2014. </body> </html> ++++++ netpbm-10.67.4-nohpcdtoppm-noppmtompeg.tar.bz2 -> netpbm-10.68.1-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++ ++++ 8058 lines of diff (skipped) ++++++ netpbm-security-code.patch ++++++ ++++ 919 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/netpbm/netpbm-security-code.patch ++++ and /work/SRC/openSUSE:Factory/.netpbm.new/netpbm-security-code.patch -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
