From root@hilbert.suse.de Mon Nov 24 10:18:34 2014 From: root@hilbert.suse.de To: commit@lists.opensuse.org Subject: commit netpbm for openSUSE:Factory Date: Mon, 24 Nov 2014 11:18:33 +0100 Message-ID: <20141124101834.04B77AE059@hilbert.suse.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6804285778566855025==" --===============6804285778566855025== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello community, here is the log from the commit of package netpbm for openSUSE:Factory checke= d 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.0000= 00000 +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 - pgajdos@suse.com + +- 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 @@ =20 =20 %define libmaj 11 -%define libmin 67 +%define libmin 68 %define libver %{libmaj}.%{libmin} =20 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-Do= main ++++++ netpbm-10.67.4-documentation.tar.bz2 -> netpbm-10.68.1-documentation.t= ar.bz2 ++++++ diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/anytopnm.html new/netpbm.s= ourceforge.net/doc/anytopnm.html --- old/netpbm.sourceforge.net/doc/anytopnm.html 2013-02-20 04:30:31.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/anytopnm.html 2014-11-15 04:18:45.00000000= 0 +0100 @@ -2,7 +2,7 @@
This program is part of Netpbm. @@ -53,6 +54,16 @@
If file is - or not given, anytopnm takes its input from Standard Input. =20 +
Many image formats are capable of representing multiple images. In +most cases, anytopnm converts these to multi-image Netpbm images, +but for some formats, anytopnm converts only the first image and +ignores the rest. + +
In the case of a multi-image GIF input, anytopnm converts all the +images starting with Netpbm 10.69 (December 2014), but only the first in +earlier releases. + +
-
-
-
+
+
+
+
diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex=
clude=3D.svnignore' old/netpbm.sourceforge.net/doc/giftopnm.html new/netpbm.s=
ourceforge.net/doc/giftopnm.html
--- old/netpbm.sourceforge.net/doc/giftopnm.html 2013-02-20 04:30:31.00000000=
0 +0100
+++ new/netpbm.sourceforge.net/doc/giftopnm.html 2014-11-15 04:42:13.00000000=
0 +0100
@@ -53,18 +53,19 @@
If you specify - as the filename, giftopnm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. =20
See pamcomp for one way to use -the alpha output file. =20 +the transparency output file. =20 =20
This program is part of Netpbm. @@ -55,6 +56,13 @@ =20
color is like the argument of +the ppm_parsecolor() library routine. +
If you don't specfy this, or the image does not contain transparency +information, ilbmtoppm does not create a mask file. +
The multipalette PCHG BigLineChanges and Huffman decompression code diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.0000000= 00 +0100 +++ new/netpbm.sourceforge.net/doc/palmtopnm.html 2014-11-15 04:41:10.0000000= 00 +0100 @@ -104,7 +104,7 @@ =20
You cannot generate an alpha mask if the Palm Bitmap has a +
You cannot generate a transparency mask if the Palm Bitmap has a transparent color. However, you can still do this with ppmcolormask with a Netpbm pipe similar to: =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pam.html new/netpbm.source= forge.net/doc/pam.html --- old/netpbm.sourceforge.net/doc/pam.html 2013-11-28 00:17:59.000000000 +01= 00 +++ new/netpbm.sourceforge.net/doc/pam.html 2014-11-15 04:41:04.000000000 +01= 00 @@ -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). =20
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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pambackground.html new/net= pbm.sourceforge.net/doc/pambackground.html --- old/netpbm.sourceforge.net/doc/pambackground.html 2013-02-20 04:30:31.000= 000000 +0100 +++ new/netpbm.sourceforge.net/doc/pambackground.html 2014-11-09 19:02:50.000= 000000 +0100 @@ -2,7 +2,7 @@
This program is part of Netpbm. =20 -
pambackground 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). - -
To identify the background, pambackground 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, pambackground 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). +
pambackground 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). + +
To identify the background, pambackground 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 do= es +not have holes through which the background can be seen. So in +specific, pambackground 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). =20
pambackground 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 pambackground on it. =20 -
In Release 10.37, pambackground 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. +
A more convenient means of dealing with a multi-shade background is +to use pnmquant to produce a version of the image with a very small +number of colors. The background would likely then be all one color. + +
If the pnmquant and ppmchange methods above do not +adequately distinguish foreground colors from background colors, you can +try a more elaborate method using pnmremap. +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 +pnmremap to create a smarter version of what you get with the +pnmquant or ppmchange methods, so that pambackground is +more likely to separate background from foreground as your eye does. =20
The PAM that pambackground 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=20 image with something else. =20 -
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 pambackground generates -to identify the transparent areas for the output. +
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 pambackground +generates to identify the transparent areas for the output. You can create +a PAM image with transparency with pamstack. =20
To simply make a mask of all the areas of a specified color, use ppmcolormask. If you have a unique background color (one that @@ -94,6 +101,7 @@ a background mask in cases that pambackground cannot: where there are see-through holes in the foreground image. =20 +
+
+ + $ pambackground test.ppm | pnminvert >/tmp/bgmask.pgm + $ pamcomp -alpha=3Dbgmask.pgm test.ppm wallpaper.ppm >output.ppm + ++
+
+ + $ pnmquant 5 test.pgm | pambackground test.ppm >/tmp/bgmask.pam + ++ +
If you add the -alpha option, then pamcomp uses the -image in file alpha-pgmfile as an alpha mask, which means it +image in file alpha-pgmfile 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. =20 -
The alpha mask is a PGM file in which a white pixel represents +
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, pamcomp will see a PBM file as if it is PGM). @@ -73,17 +73,17 @@
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 pamcomp 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, pamcomp +transparency mask described above. If you supply both an overlay image that +has transparency information and a transparency mask, pamcomp multiplies the two opacities to get the opacity of the overlay pixel. =20
Before Netpbm 10.25 (October 2004), pamcomp 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 pamcomp. =20
The output image is always of the same dimensions as the underlying @@ -187,17 +187,17 @@ =20
-You can specify - as the value of this option and the alpha +You can specify - 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. =20
If you specify an alpha mask (the -alpha option), -pamcomp uses the product of the opacity indicated by the alpha +
If you specify a transparency mask (the -alpha option), +pamcomp uses the product of the opacity indicated by the transparency mask (as modified by the -invert option, as a fraction, and this opacity value. The -invert option does not apply to this opacity value. @@ -261,10 +261,10 @@ =20
The alpha mask and -opacity values indicate a fraction of +
The transparency mask and -opacity 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 pamcomp, by @@ -310,7 +310,7 @@
ppmcolormask and pbmmask, and pambackground can help with -generating an alpha mask. +generating a transparency mask. =20
pnmcomp is an older program that runs faster, but has less function. diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.0000000= 00 +0200 +++ new/netpbm.sourceforge.net/doc/pamcrater.html 2014-11-03 18:16:11.0000000= 00 +0100 @@ -2,7 +2,7 @@
This program is part of Netpbm. =20 -
pamcrater 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 crea= te -craters with random position and size. +
pamcrater 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. =20
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 @@
Larger craters should really use this profile, including the central peak, and totally obliterate the pre-existing terrain. =20 +
The maxval of the PAM image is always 65535. +
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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pammosaicknit.html new/net= pbm.sourceforge.net/doc/pammosaicknit.html --- old/netpbm.sourceforge.net/doc/pammosaicknit.html 2013-02-20 04:30:31.000= 000000 +0100 +++ new/netpbm.sourceforge.net/doc/pammosaicknit.html 2014-09-10 21:39:22.000= 000000 +0200 @@ -1,5 +1,4 @@ - +
Copyright © 2010 Scott Pakin, scott+pbm@pakin.org.
- -Copyright © 2010 Scott Pakin, +scott+pbm@pakin.org. =20
The input image if from the file named by the pamfile argument, +
The input image is from the file named by the pamfile argument, or Standard Input if you don't specify pamfile. The output goes to Standard Output. =20 @@ -41,7 +41,7 @@ it considerably less convenient to use. =20
(But note that pnmtopng 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). =20
Netpbm's strategic direction is to add to pnmtopng all the capabilities of pamrgbatopng and retire pamrgbatopng. diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pamthreshold.html new/netp= bm.sourceforge.net/doc/pamthreshold.html --- old/netpbm.sourceforge.net/doc/pamthreshold.html 2013-02-20 04:30:31.0000= 00000 +0100 +++ new/netpbm.sourceforge.net/doc/pamthreshold.html 2014-11-15 04:39:04.0000= 00000 +0100 @@ -37,12 +37,12 @@
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. =20
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 @@ =20
The output is to Standard Output. =20 -
When the input has an alpha channel, pamthreshold includes -an alpha channel in the output. Since the output has maxval 1, the -alpha channel can indicate only fully transparent or fully opaque. +
When the input has a transparency channel, pamthreshold includes +a transparency channel in the output. Since the output has maxval 1, the +transparency channel can indicate only fully transparent or fully opaque. pamthreshold make it fully transparent where the input is more than half transparent and fully opaque where it isn't. =20 -
The alpha function was new in Netpbm 10.43 (June 2008). Before -that, pamthreshold ignores any alpha channel in the input. +
The transparency function was new in Netpbm 10.43 (June 2008). Before +that, pamthreshold ignores any transparency channel in the input. =20
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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pamtoavs.html new/netpbm.s= ourceforge.net/doc/pamtoavs.html --- old/netpbm.sourceforge.net/doc/pamtoavs.html 2013-02-20 04:30:31.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/pamtoavs.html 2014-09-10 18:49:35.00000000= 0 +0200 @@ -1,4 +1,4 @@ - +
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 (ppmhist -can tell you), you can use pnmquant to reduce it to 256. +can tell you), you can use pnmquant to reduce it to 256. Or +use the more complex but faster method described under the -mapfile +option. =20
If your input image is a PAM with transparency information, ppmtogif= b> uses one entry in the GIF colormap specifically for the transparent pixels, @@ -121,10 +123,29 @@ =20
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 might not, run your input through pnmremap using the same map file so that it does. =20 +
You can use -mapfile 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 pamgtogif can +convert it (a GIF can have only 256 colors; pamtogif without +-mapfile fails on any image that has more than that) with +pnmquant. When you do this, pnmquant generates a palette to do +the color quantization, then pamtogif generates an identical palette +from the quantized image. You can save computation by generating the palette +once: + +
+ + $ pnmcolormap 256 myimage.ppm >/tmp/colormap.ppm + $ pamtogif myimage.ppm -mapfile=3D/tmp/colormap.ppm >output.gif + ++ +
The alpha image must be the same dimensions as the input +
The transparency image must be the same dimensions as the input image, but may have any maxval. White means opaque and black means transparent. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pamtooctaveimg.html new/ne= tpbm.sourceforge.net/doc/pamtooctaveimg.html --- old/netpbm.sourceforge.net/doc/pamtooctaveimg.html 2013-02-20 04:30:31.00= 0000000 +0100 +++ new/netpbm.sourceforge.net/doc/pamtooctaveimg.html 2014-09-10 18:49:28.00= 0000000 +0200 @@ -1,4 +1,4 @@ - +
To create a TGA image with transparency (i.e. with an alpha mask), +
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 pamstack. =20
It is unclear that anything except pamtotga 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. =20
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), pamtotga diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pamtouil.html new/netpbm.s= ourceforge.net/doc/pamtouil.html --- old/netpbm.sourceforge.net/doc/pamtouil.html 2013-05-29 03:34:18.00000000= 0 +0200 +++ new/netpbm.sourceforge.net/doc/pamtouil.html 2014-11-15 04:37:22.00000000= 0 +0100 @@ -8,7 +8,7 @@
This program is part of Netpbm. =20 -
pamtouil 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, pamtouil renders pixels -that are more than half transparent as transparent in the output. +
pamtouil 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, pamtouil renders pixels th= at +are more than half transparent as transparent in the output. =20
In the UIL's colormap, pamtouil uses the color names from the RGB database -- the same one ppmmake diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pamtowinicon.html new/netp= bm.sourceforge.net/doc/pamtowinicon.html --- old/netpbm.sourceforge.net/doc/pamtowinicon.html 2013-09-03 22:01:15.0000= 00000 +0200 +++ new/netpbm.sourceforge.net/doc/pamtowinicon.html 2014-11-15 04:37:00.0000= 00000 +0100 @@ -85,10 +85,11 @@
channels | image |
---|---|
1 | fully opaque grayscale image |
2 | grayscale image with alpha channel |
2 | grayscale image with transparency channel |
3 | fully opaque color image |
4 | color image with alpha channel |
5 | color image with alpha channel and additional AND mask |
4 | color image with transparency channel |
5 | color image with transparency channel and additional AND +mask |
The tuple types of the PAMs are irrelevant. @@ -98,13 +99,13 @@ =20 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 Windows Icons for details. =20
If there is no explicit AND mask, but transparency data in the input image, pamtowinicon 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. =20
If no transparency data is present in the input image, diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pbmtext.html new/netpbm.so= urceforge.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 @@
If you want to overlay colored text instead of black, just use ppmchange 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. =20
If you want the text at an angle, use pnmrotate on the text -image (and alpha mask) before overlaying. +image (and transparency mask) before overlaying. =20
pamstretch is backward compatible with pnminterp, but -also recognizes PAM input, including that with an alpha channel. +also recognizes PAM input, including that with a transparency channel. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.0000000= 00 +0100 +++ new/netpbm.sourceforge.net/doc/pnmmargin.html 2014-11-12 04:41:20.0000000= 00 +0100 @@ -2,7 +2,7 @@
pnmmargin adds a border around a PNM image. =20 + +
pnmfile is the name of the input file. If you don't specify this +argument, pnmmargin reads the input image from its Standard Input. + +
You can specify the border color with the -white, --black, and -color options. If no color is specified, -the program makes a guess. +-black, and -color options. If you don't specify a color, the +program makes a guess. + +
The value of -color is like the +argument of the ppm_parsecolor() +library routine. =20
To remove a border of a specified size from an image, use pamcut. pnmcrop also removes borders, but determines by itself @@ -41,6 +52,7 @@
pnmpad does essentially the same thing, but gives you more control over the individual margins and does only black and white margins. =20 +
pamcomp is a more general tool, except that it lacks the "or," "and," and "xor" functions. -pamcomp allows you to specify an alpha mask in order to have +pamcomp 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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/pnmremap.html new/netpbm.s= ourceforge.net/doc/pnmremap.html --- old/netpbm.sourceforge.net/doc/pnmremap.html 2013-02-20 04:30:31.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/pnmremap.html 2014-11-14 05:04:42.00000000= 0 +0100 @@ -2,7 +2,7 @@
If you specify -firstisdefault, the maxval of your input must match the maxval of your palette image. =20 -
colorspec is as described for +the argument of the ppm_parsecolor() +library routine. +
If you specify -missingcolor, the maxval of your input must match the maxval of your palette image. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.0000000= 00 +0200 +++ new/netpbm.sourceforge.net/doc/pnmtopalm.html 2014-11-14 05:18:00.0000000= 00 +0100 @@ -2,7 +2,7 @@
colorspec is as described for the +argument of the ppm_parsecolor() +library routine. =20 + +
Transparency works only on Palm OS 3.5 and higher. =20
This program is part of Netpbm. =20
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. =20
The RLE file will contain either a three channel color image (24 @@ -58,10 +58,10 @@
The output of ppmcolormask is useful as an alpha mask input -to pamcomp. Note that you can generate such an alpha mask -automatically as you convert to PNG format with pnmtopng. Use its -transparent -option. +
The output of ppmcolormask is useful as a transparency mask input +to pamcomp. Note that you don't need ppmcolormask and +pamcomp if you are ultimately converting to PNG with +pnmtopng because the -transparent option on pnmtopng do= es +the same thing. =20
ppmfile is the input file. If you don't specify ppmfile, the input is from Standard Input. @@ -112,6 +112,7 @@ pgmtoppm, pamcomp, pbmmask, +pbmmask, ppm =20 =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/ppmdraw.html new/netpbm.so= urceforge.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 setcolor, the current color is white. =20 +
There is one argument. It specifies the color as described for the +argument of the ppm_parsecolor() +library routine. +
pamcomp 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. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.000000= 000 +0100 +++ new/netpbm.sourceforge.net/doc/ppmrainbow.html 2014-11-15 04:33:46.000000= 000 +0100 @@ -2,7 +2,7 @@
This program is part of Netpbm. =20 ppmrainbow 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 --norepeat option. +another to another from left to right, like a rainbow. =20
If you want a vertical or other non-horizontal rainbow, run the output through pnmrotate or pamflip. =20
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 pbmtext, pamcomp, and ppmrainbow. =20 @@ -43,6 +40,21 @@
If you just want an image containing all the possible colors (for some kind of processing; not to look at), see pamseq. =20 + +
color ... is the list of colors, in order from left to right, +to go into the rainbow. + +
The first color is added again on the right end of the image unless you +specify the -norepeat option. This means you can concatenate multiple +copies (tile, as with pnmtile) to make a continuous larger image. + +
color is as described for +the argument of the ppm_parsecolor() +library routine. + +
All options can be abbreviated to their shortest unique prefix. @@ -70,8 +82,7 @@
You could use ppmrough with ppmtopgm 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. =20
pamtotga is backward compatible with ppmtotga, but -also recognizes PAM input, including that with an alpha channel. +also recognizes PAM input, including that with a transparency channel. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/ppmtowinicon.html new/netp= bm.sourceforge.net/doc/ppmtowinicon.html --- old/netpbm.sourceforge.net/doc/ppmtowinicon.html 2013-04-15 01:59:57.0000= 00000 +0200 +++ new/netpbm.sourceforge.net/doc/ppmtowinicon.html 2014-11-15 04:33:20.0000= 00000 +0100 @@ -62,7 +62,7 @@ as with any Netpbm program, you can use a PBM image for the transparency mask and ppmtowinicon will treat it like a PGM. =20 -
The and mask is like an alpha mask, except for what it signifies in +
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=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/ppmtoxpm.html new/netpbm.s= ourceforge.net/doc/ppmtoxpm.html --- old/netpbm.sourceforge.net/doc/ppmtoxpm.html 2013-12-08 01:05:33.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/ppmtoxpm.html 2014-11-15 04:33:03.00000000= 0 +0100 @@ -62,17 +62,16 @@
All color codes in an image are the same length, and ppmtoxpm tries to make it as short as possible. That length is, of course, determined by the number of colors in the image. -ppmtoxpm 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. +ppmtoxpm 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. =20 -
There's one exception to the above: If you specify an alpha mask +
There's one exception to the above: If you specify a transparency mask (the -alpha option, one unique color code represents -"transparent." This is true even if the alpha mask doesn't=20 +"transparent." This is true even if the transparency mask doesn't= =20 actually produce any transparent pixels. So subtract one from the number of possible colors if you use -alpha. =20 @@ -114,15 +113,15 @@ =20
If you don't specify -alphamask, ppmtoxpm makes all pixels in the output opaque. =20 =20 -
ppmcolormask is one way to generate an alpha mask file. You +
ppmcolormask is one way to generate a transparency mask file. You might also generate it by extracting transparency information from an XPM file with the -alphaout option to xpmtoppm. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/rlatopam.html new/netpbm.s= ourceforge.net/doc/rlatopam.html --- old/netpbm.sourceforge.net/doc/rlatopam.html 2013-02-20 04:30:31.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/rlatopam.html 2014-11-15 04:32:21.00000000= 0 +0100 @@ -22,7 +22,7 @@ =20
rlatopam 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. =20
rlafile is the file name of the input file. If you omit this parameter, rlatopam reads the image from Standard Input. diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/rletopnm.html new/netpbm.s= ourceforge.net/doc/rletopnm.html --- old/netpbm.sourceforge.net/doc/rletopnm.html 2013-02-20 04:30:32.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/rletopnm.html 2014-11-15 04:32:04.00000000= 0 +0100 @@ -45,18 +45,18 @@ =20
If you specify - as the filename, rletopnm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. =20
See pamcomp for one way to use -the alpha output file. +the transparency output file. =20
@@ -129,12 +129,11 @@ =20Modifications by Eric Haines to support raw and plain formats. =20 -
Modifications by Bryan Henderson to create alpha files and use +
Modifications by Bryan Henderson to create transparency files and use mnemonic options. =20
- -Table Of Contents
+Table Of Contents
A 2-channel image is grayscale plus alpha (transparency), so you can get +
A 2-channel image is grayscale plus transparency, so you can get the transparency information with -channel=3D2. You could then combine them into a PAM image of tuple type GRAYSCALE_ALPHA with pamstack. diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/srftopam.html new/netpbm.s= ourceforge.net/doc/srftopam.html --- old/netpbm.sourceforge.net/doc/srftopam.html 2013-05-29 03:34:19.00000000= 0 +0200 +++ new/netpbm.sourceforge.net/doc/srftopam.html 2014-09-10 18:49:18.00000000= 0 +0200 @@ -1,4 +1,4 @@ - +
If you specify - as the filename, tgatoppm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. =20
See pamcomp for one way to use -the alpha output file. +the transparency output file. =20
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 @@
If you specify - as the filename, tifftopnm -writes the alpha output to Standard Output and discards the image. +writes the transparency output to Standard Output and discards the image. =20
See pamcomp for one way to use -the alpha output file. +the transparency output file. =20
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 +
Since Windows XP, there may also be an 8-bit transparency channel in 32-b= pp +BMP encoded icon images. The AND mask, however, is still required and used e.g. for generating shadows. =20
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. =20 =20
winicontopam reads a Microsoft Windows icon file and converts it to one or more RGB_ALPHA Netpbm PAM files. =20 -
The alpha channel is copied from the 8-bit transparency data from the ico= n, -if present. If no 8-bit transparency data is available, the alpha channel is -constructed from the so-called ‘AND mask’. +
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&rsquo= ;. =20
The output goes to Standard Output. =20 diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.svnignore' old/netpbm.sourceforge.net/doc/ximtoppm.html new/netpbm.s= ourceforge.net/doc/ximtoppm.html --- old/netpbm.sourceforge.net/doc/ximtoppm.html 2013-02-20 04:30:31.00000000= 0 +0100 +++ new/netpbm.sourceforge.net/doc/ximtoppm.html 2014-11-15 04:28:09.00000000= 0 +0100 @@ -36,23 +36,23 @@
If you specify - as the filename, ximtoppm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. =20
Actually, an Xim image can contain an arbitrary fourth channel -- -it need not be an Alpha channel. ximtoppm 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. ximtoppm extracts any fourth +channel it finds as described above; it doesn't matter if it is a +transparency channel or not. =20
See pamcomp for one way to use -the alpha output file. +the transparency output file. =20
If you specify - as the filename, xpmtoppm writes the -alpha output to Standard Output and discards the image. +transparency output to Standard Output and discards the image. =20
See pamcomp for one way to use -the alpha output file. +the transparency output file. =20
xpmtoppm can't handle a line longer than 8K characters in the XPM input. If an input line exceeds this limit, diff -urN '--exclude=3DCVS' '--exclude=3D.cvsignore' '--exclude=3D.svn' '--ex= clude=3D.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.0000000= 00 +0200 +++ new/netpbm.sourceforge.net/getting_netpbm.php 2014-11-18 17:13:09.0000000= 00 +0100 @@ -365,7 +365,7 @@ =20
-This page was generated on 08 Sep 2014. +This page was generated on 18 Nov 2014. =20 =20 ++++++ netpbm-10.67.4-nohpcdtoppm-noppmtompeg.tar.bz2 -> netpbm-10.68.1-nohpc= dtoppm-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 --=20 To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org --===============6804285778566855025==--