pamstereogram pays no attention the the image's tuple ++
pamstereogram pays no attention the image's tuple + type and ignores all planes other than plane 0.
+ +Like any Netpbm program, pamstereogram will accept PNM +diff --git a/userguide/pamtofits.html b/userguide/pamtofits.html +index 445b326..0ecc806 100644 +--- a/userguide/pamtofits.html ++++ b/userguide/pamtofits.html +@@ -54,7 +54,7 @@ approximation. +
The FITS specification does not specify which data in the file corresponds +-to which pixel in the image (i.e. which bytes are the the top left pixel, ++to which pixel in the image (i.e. which bytes are the top left pixel, + etc.). Netpbm uses the common sense, most popular arrangement: row major, top + to bottom, left to right. That means in a 10 wide by 20 high image, the first + 10 pixels in the file are the top row and the last 10 are the bottom row. +diff --git a/userguide/pamtojpeg2k.html b/userguide/pamtojpeg2k.html +index 06b6113..046d740 100644 +--- a/userguide/pamtojpeg2k.html ++++ b/userguide/pamtojpeg2k.html +@@ -181,7 +181,7 @@ its goal is similar to JPEG. It has two main differences from JPEG. +
One difference is that it does a much better job on most images of + throwing out information in order to achieve a smaller output. That + means when you reconstruct the image from the resulting compressed +-file, it looks a lot closer to the image you started with with ++file, it looks a lot closer to the image you started with + JPEG-2000 than with JPEG, for the same compressed file size. Or, looked + at another way, with JPEG-2000 you get a much smaller file than with + JPEG for the same image quality. +diff --git a/userguide/pamtotiff.html b/userguide/pamtotiff.html +index f07d227..c7a48a0 100644 +--- a/userguide/pamtotiff.html ++++ b/userguide/pamtotiff.html +@@ -124,7 +124,7 @@ format it produces are therefore controlled by that library. +
By default, pamtotiff creates a TIFF file with no + compression. This is your best bet most of the time. If you want to + try another compression scheme or tweak some of the other even more +-obscure output options, there are a number of options which which to ++obscure output options, there are a number of options which to + play. + +
Before Netpbm 8.4 (April 2000), the default was to use LZW compression. +diff --git a/userguide/pamtouil.html b/userguide/pamtouil.html +index 1074119..6c2356b 100644 +--- a/userguide/pamtouil.html ++++ b/userguide/pamtouil.html +@@ -57,7 +57,7 @@ in the RGB database. + +
All characters referred to herein are encoded in ASCII. +-"newline" refers the the character known in ASCII as Line ++"newline" refers the character known in ASCII as Line + Feed or LF. A "white space" character is space, CR, LF, + TAB, VT, or FF (I.e. what the ANSI standard C isspace() function + calls white space). +diff --git a/userguide/pbmtolj.html b/userguide/pbmtolj.html +index ce7e9bb..6da4555 100644 +--- a/userguide/pbmtolj.html ++++ b/userguide/pbmtolj.html +@@ -83,7 +83,7 @@ and end of the output file. + +
All characters referred to herein are encoded in ASCII. +-"newline" refers the the character known in ASCII as Line ++"newline" refers the character known in ASCII as Line + Feed or LF. A "white space" character is space, CR, LF, + TAB, VT, or FF (I.e. what the ANSI standard C isspace() function + calls white space). +diff --git a/userguide/pngtopam.html b/userguide/pngtopam.html +index 8185843..09406ef 100644 +--- a/userguide/pngtopam.html ++++ b/userguide/pngtopam.html +@@ -269,7 +269,7 @@ change to the package in Netpbm's renaissance. It and pnmtopng + were simply copied from the + pnmtopng package by Greg Roelofs. Those were based on +-simpler reference applications by by Alexander Lehmann ++simpler reference applications by Alexander Lehmann + <alex@hal.rhein-main.de> and Willem van Schaik + <willem@schaik.com> and distributed with their PNG library. + +diff --git a/userguide/pnmnorm.html b/userguide/pnmnorm.html +index c4d2558..5d3ca49 100644 +--- a/userguide/pnmnorm.html ++++ b/userguide/pnmnorm.html +@@ -146,7 +146,7 @@ value 99 or the white value 101. + option. Sometimes, too much contrast is a bad thing. If your + intensities are all concentrated in the middle, -bpercent=2 and + -wpercent=1 might mean that an intensity of 60 gets stretched +-up to 100 and and intensity of 20 gets stretched down to zero, for a ++up to 100 and intensity of 20 gets stretched down to zero, for a + range expansion of 150% (from a range of 40 to a range of 100). That + much stretching means two adjacent pixels that used to differ in + intensity by 4 units now differ by 10, and that might be unsightly. +diff --git a/userguide/pnmtopalm.html b/userguide/pnmtopalm.html +index 94aa6ff..9ca9c0d 100644 +--- a/userguide/pnmtopalm.html ++++ b/userguide/pnmtopalm.html +@@ -164,7 +164,7 @@ the -colormap option, for much the same reason. + +
All characters referred to herein are encoded in ASCII. +-"newline" refers the the character known in ASCII as Line ++"newline" refers the character known in ASCII as Line + Feed or LF. A "white space" character is space, CR, LF, + TAB, VT, or FF (I.e. what the ANSI standard C isspace() function + calls white space). +diff --git a/userguide/ppmtompeg.html b/userguide/ppmtompeg.html +index 4fa4a53..99efed9 100644 +--- a/userguide/ppmtompeg.html ++++ b/userguide/ppmtompeg.html +@@ -1023,7 +1023,7 @@ without respect to any other frame in the movie. A P frame + ("predictive" frame) describes a movie frame by describing how it + differs from the movie frame described by the latest preceding I or + P frame. A B frame ("bidirectional" frame) describes a movie frame by +-describing how it differs from the the movie frames described by the ++describing how it differs from the movie frames described by the + nearest I or P frame before and after it. + +
Note that the first frame of a movie must be described by an I +diff --git a/userguide/ppmtopj.html b/userguide/ppmtopj.html +index c07c1d9..b50be28 100644 +--- a/userguide/ppmtopj.html ++++ b/userguide/ppmtopj.html +@@ -61,7 +61,7 @@ You could convert your input to this format like this: + pnmremap -map 8color.pam testimg.pam | ppmtopj + + +-Or you could use use ++Or you could use +
+ ppmdither -red 2 -green 2 -blue 2 ++diff --git a/userguide/qrttoppm.html b/userguide/qrttoppm.html +index b6bf976..112bf50 100644 +--- a/userguide/qrttoppm.html ++++ b/userguide/qrttoppm.html +@@ -22,7 +22,7 @@ qrttoppm - convert output from the QRT ray tracer to a PPM image + +
This program is part of Netpbm. + +-
qrttoppm reads a QRT file as input and and produces a PPM ++
qrttoppm reads a QRT file as input and produces a PPM + image as output. + + +diff --git a/userguide/sbigtopgm.html b/userguide/sbigtopgm.html +index 400bcaf..78f9454 100644 +--- a/userguide/sbigtopgm.html ++++ b/userguide/sbigtopgm.html +@@ -22,7 +22,7 @@ sbigtopgm - convert an SBIG CCDOPS file to PGM + +
This program is part of Netpbm. + +-
sbigtopgm reads an an image file in the native format used ++
sbigtopgm reads an image file in the native format used + by the Santa Barbara Instrument Group (SBIG) astronomical CCD cameras, + and produces a PGM image as output. Additional information on SBIG + cameras and documentation of the file format is available at the Web +diff --git a/userguide/srftopam.html b/userguide/srftopam.html +index b27f133..c98586f 100644 +--- a/userguide/srftopam.html ++++ b/userguide/srftopam.html +@@ -30,7 +30,7 @@ + +
This program is part of Netpbm.
+ +-srftopam reads a a SRF image file as input and produces a ++
srftopam reads a SRF image file as input and produces a + multi-image stream of PAM images as output. + +
This program performs the inverse of the conversion that pamtosrf +diff --git a/userguide/sunicontopnm.html b/userguide/sunicontopnm.html +index 6ccbcde..0290f7b 100644 +--- a/userguide/sunicontopnm.html ++++ b/userguide/sunicontopnm.html +@@ -54,7 +54,7 @@ mostly XPM files. + xbmtoppm, + infotopam, + pbm +-pbm ++pgm + +
xpmtoppm can't handle a line longer than 8K characters in
+-the the XPM input. If an input line exceeds this limit,
++the XPM input. If an input line exceeds this limit,
+ xpmtoppm quits with an error message to that effect. Before
+ Netpbm 10.30 (October 2005), the limit was 2K.
+
diff --git a/netpbm.spec b/netpbm.spec
index 9e9092d..e1f2e04 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,7 +1,7 @@
Summary: A library for handling different graphics file formats
Name: netpbm
Version: 10.61.02
-Release: 1%{?dist}
+Release: 2%{?dist}
# See copyright_summary for details
License: BSD and GPLv2 and IJG and MIT and Public Domain
Group: System Environment/Libraries
@@ -33,6 +33,7 @@ Patch22: netpbm-pamtojpeg2k.patch
Patch23: netpbm-manfix.patch
Patch24: netpbm-ppmtopict.patch
Patch25: netpbm-pnmtopclxl.patch
+Patch26: netpbm-man-repeated.patch
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
BuildRequires: libX11-devel, python, jasper-devel, libxml2-devel
@@ -106,6 +107,7 @@ netpbm-doc. You'll also need to install the netpbm-progs package.
%patch23 -p1 -b .manfix
%patch24 -p1 -b .ppmtopict
%patch25 -p1 -b .pnmtopclxl
+%patch26 -p1 -b .man-repeated
sed -i 's/STRIPFLAG = -s/STRIPFLAG =/g' config.mk.in
rm -rf converter/other/jpeg2000/libjasper/
@@ -256,6 +258,9 @@ rm -rf $RPM_BUILD_ROOT
%doc userguide/*
%changelog
+* Mon May 27 2013 Petr Hracek