Hello community,
here is the log from the commit of package netpbm for openSUSE:Factory checked
in at 2014-06-25 15:24:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-06
07:10:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.netpbm.new/netpbm.changes 2014-06-25
15:24:15.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Jun 23 13:53:54 UTC 2014 - pgaj...@suse.com
+
+- updated to 10.66.3
+ * sgitopnm: fix bug: no output if input is RLE compressed.
+ * jpegtopnm -dumpexif: fix incorrect display of resolution.
+ * jpegtopnm -dumpexif: fix truncated make, model, or datetime.
+ * jpegtopnm -dumpexif: fix wild pointer with invalid EXIF data.
+ * build fixes
+
+-------------------------------------------------------------------
Old:
----
netpbm-10.66.0-documentation.tar.bz2
netpbm-10.66.0-nohpcdtoppm-noppmtompeg.tar.bz2
New:
----
netpbm-10.66.3-documentation.tar.bz2
netpbm-10.66.3-nohpcdtoppm-noppmtompeg.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netpbm.spec ++++++
--- /var/tmp/diff_new_pack.XWe0I1/_old 2014-06-25 15:24:16.000000000 +0200
+++ /var/tmp/diff_new_pack.XWe0I1/_new 2014-06-25 15:24:16.000000000 +0200
@@ -21,7 +21,7 @@
%define libver %{libmaj}.%{libmin}
Name: netpbm
-Version: 10.66.0
+Version: 10.66.3
Release: 0
Summary: A Powerful Graphics Conversion Package
License: BSD-3-Clause and GPL-2.0+ and SUSE-IJG and MIT and
SUSE-Public-Domain
++++++ netpbm-10.66.0-documentation.tar.bz2 ->
netpbm-10.66.3-documentation.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamsharpness.html
new/netpbm.sourceforge.net/doc/pamsharpness.html
--- old/netpbm.sourceforge.net/doc/pamsharpness.html 2013-02-20
04:30:31.000000000 +0100
+++ new/netpbm.sourceforge.net/doc/pamsharpness.html 2014-04-13
04:50:06.000000000 +0200
@@ -18,7 +18,7 @@
<p>This program is part of <a href="index.html">Netpbm</a>.
<p><b>pamsharpness</b> reads a Netpbm image (PNM or PAM) and prints a
-number that tells how sharp it is.
+message to Standard Output giving a number that tells how sharp it is.
<p>Sharpness is a measure of how suddenly (in space) colors change in
the image. <b>pamsharpness</b> computes the sharpness of the image as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pamtotiff.html
new/netpbm.sourceforge.net/doc/pamtotiff.html
--- old/netpbm.sourceforge.net/doc/pamtotiff.html 2013-12-08
00:59:20.000000000 +0100
+++ new/netpbm.sourceforge.net/doc/pamtotiff.html 2014-04-17
04:50:29.000000000 +0200
@@ -2,7 +2,7 @@
<HTML><HEAD><TITLE>Pamtotiff User Manual</TITLE></HEAD>
<BODY>
<H1>pamtotiff</H1>
-Updated: 03 December 2008
+Updated: 17 April 2014
<BR>
<A HREF="#index">Table Of Contents</A>
@@ -69,10 +69,46 @@
<h3 id="output">The Output File</h3>
-<P>The output goes to Standard Output. <b>pamtotiff</b> approaches
-this output file differently from Unix and Netpbm convention. This is due
-entirely to <b>pamtotiff</b>'s use of the TIFF library to do all
-TIFF output.
+<P>By default, the output goes to Standard Output. Alternatively, you can
+specify an output file with the <b>-output</b> option and <b>pamtotiff</b>
+will write its output directly to that file.
+
+<p>Because of the way the TIFF library (which <b>pamtotiff</b> uses) works,
+when the program writes to Standard Output, it generates the entire TIFF image
+in a temporary file and then copies it to Standard Output; you may see
+negative performance effects of this.
+
+<p>The <b>-output</b> method avoids the performance effects of the copy
+through the temporary file, but there are restrictions on the output file: it
+must be seekable and it must be readable. The program fails if it is not.
+With Standard Output, neither of those restrictions applies.
+
+<p>With <b>-output</b>, if the file already exists and has data in it,
+<b>pamtotiff</b> appends the image to the existing TIFF file. (A TIFF file
+may contain multiple images).
+
+<p>By default, <b>pamtotiff</b> creates the file named by <b>-output</b> if it
+does not already exist. But if you also specify <b>-append</b>, the program
+fails if the file named by <b>-output</b> does not already exist.
+
+<p>Before Netpbm 10.67 (June 2014), there is no <b>-output</b> option and
+Standard Output must be seekable. So pipes are out.
+
+<p>Before Netpbm 10.67 (June 2014), you could append to Standard Output. See
+below. The current program does not have the ability; you must
+use <b>-output</b> to append to an existing TIFF file.
+
+<p>The difference above means current <b>pamtotiff</b> is actually not
+backward compatible, which is a rare thing for Netpbm. But it's a good thing
+because the previous function was very strange and probably hardly ever
+exploited.
+
+
+<h4 id="oldoutput">Old Versions</h4>
+
+<p>As alluded to above, <b>pamtotiff</b> does output very differently
+in releases before 10.67. The following describes the old function,
+which is unusual both for Netpbm and for Unix programs in general.
<ul>
<li>The output file must be seekable. <b>pamtotiff</b> does not
@@ -330,6 +366,29 @@
<p><b>-tag</b> was new in Netpbm 10.31 (December 2005).
+<h3 id="outputoptions">Output</h3>
+
+<p>See <a href="output">The Output File</a>.
+
+<p><b>-output</b> names the output file. Without this option
+<b>pamtotiff</b> writes to Standard Output.
+
+<p>The <b>-append</b> option tells <b>pamtotiff</b> only to append to the file
+named by <b>output</b>; not create it. Without this option, the program
+creates the file it does not already exist. But even then, if the file does
+already exist, the program appends the image to what is in the file already.
+(A TIFF file may contain multiple images).
+
+<p><b>-append</b> has no effect if you don't also specify <b>-output</b>.
+
+<p>Before Netpbm 10.67 (June 2014), <b>-append</b> means something rather
+different: it means to append the image to the output TIFF file (which is
+always Standard Output in 10.67) instead of replacing its contents.
+
+<p><b>-append</b> was new in Netpbm 10.27 (March 2005).
+
+
+
<h3 id="other">Other</h3>
<P>You can use the <B>-rowsperstrip</B> option to set the number of
@@ -337,12 +396,6 @@
default, the output file has the number of rows per strip set to a
value that will ensure each strip is no more than 8 kilobytes long.
-<p>The <b>-append</b> option tells <b>pamtotiff</b> to add images to
-the existing output file (a TIFF file may contain multiple images)
-instead of the default, which is to replace the output file.
-
-<p><b>-append</b> was new in Netpbm 10.27 (March 2005).
-
<H2 id="notes">NOTES</H2>
@@ -512,7 +565,10 @@
<LI><A HREF="#synopsis">SYNOPSIS</A>
<LI><A HREF="#description">DESCRIPTION</A>
<ul>
- <li><a href="#outputfile">The Output File</a>
+ <li><a href="#output">The Output File</a>
+ <ul>
+ <li><a href="#oldoutput">Old Versions</a>
+ </ul>
<li><a href="#library">TIFF Capability</a>
</ul>
<LI><A HREF="#options">OPTIONS</A>
@@ -524,6 +580,7 @@
<li><a href="#fillorder">Fill Order</a>
<li><a href="#colorspacer">Color Space</a>
<li><a href="#extratags">Extra Tags</a>
+ <li><a href="#outputoptions">Output</a>
<li><a href="#other">Other</a>
</ul>
<LI><A HREF="#notes">NOTES</A>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm.sourceforge.net/doc/pnmscalefixed.html
new/netpbm.sourceforge.net/doc/pnmscalefixed.html
--- old/netpbm.sourceforge.net/doc/pnmscalefixed.html 2013-02-20
04:30:31.000000000 +0100
+++ new/netpbm.sourceforge.net/doc/pnmscalefixed.html 2014-05-05
21:26:57.000000000 +0200
@@ -8,7 +8,7 @@
<H2>NAME</H2>
-pnmscale - scale a PNM file quickly
+pnmscalefixed - scale a PNM file quickly
<H2 id="description">DESCRIPTION</H2>
@@ -16,7 +16,7 @@
<B>pnmscalefixed</B> is like <B>pamscale</B> except that
it uses fixed point arithmetic internally instead of floating point,
-which makes it run faster. In turn, it is less accurate and may
+which may make it run faster. In turn, it is less accurate and may
distort the image. It also lacks many of the features of <b>pamscale</b>.
<P>Use the <B>pamscale</B> user manual with <B>pnmscalefixed</B>. This
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 2013-02-20
04:30:31.000000000 +0100
+++ new/netpbm.sourceforge.net/doc/sgitopnm.html 2014-04-25
04:52:00.000000000 +0200
@@ -2,16 +2,15 @@
<HTML><HEAD><TITLE>Sgitopnm User Manual</TITLE></HEAD>
<BODY>
<H1>sgitopnm</H1>
-Updated: 29 Jul 2000
+Updated: 25 April 2014
<BR>
<A HREF="#index">Table Of Contents</A>
-<A NAME="lbAB"> </A>
+
<H2>NAME</H2>
sgitopnm - convert a SGI image file to PNM
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
+<H2 id="synopsis">SYNOPSIS</H2>
<B>sgitopnm</B>
@@ -19,68 +18,84 @@
[<B>-channel</B> <I>c</I>]
-[<I>SGIfile</I>]
+[<I>SgiFileName</I>]
+
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
+<H2 id="description">DESCRIPTION</H2>
<p>This program is part of <a href="index.html">Netpbm</a>.
<p><b>sgitopnm</b> reads an SGI image file as input and produces a PGM
-image for a 2-dimensional (1 channel) input file, and a PPM image for
+image for a 2-dimensional (1- or 2-channel) input file, and a PPM image for
a 3-dimensional (3 or more channels) input file.
<P>Alternatively, the program produces a PGM image of any one of the
channels in the input file.
-<A NAME="lbAE"> </A>
-<H2>OPTIONS</H2>
+<p>Before Netpbm 10.67 (June 2014), <b>sgitopnm</b> does not work on 2-channel
+SGI images. It fails if you try.
+
+<p>If you don't specify the <i>SgiFileName</i> argument, input is from
+Standard Input.
+
+<p>Before Netpbm 10.67 (June 2014), <b>sgitopnm</b> requires its input to
+be a seekable file, so for example you can't feed it from a pipe.
+
+
+<H2 id="options">OPTIONS</H2>
<DL COMPACT>
<DT><B>-verbose</B>
<DD>Give some information about the SGI image file.
-<DT><B>-channel</B> <I>c</I>
+<DT><B>-channel</B> <I>n</I>
+
+<DD>Extract channel <I>n</I> of the image as a PGM image.
-<DD>Extract channel <I>c</I> of the image as a PGM image. Without
-this option, <B>sgitopnm</B> extracts the first 3 channels as a PPM
-image or, if the input has only 1 channel, extracts that as a PGM
-image, and if the input has 2 channels, fails.
+<p>Without this option, <B>sgitopnm</B> extracts the first 3 channels as a PPM
+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
+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>.
</DL>
-<A NAME="lbAF"> </A>
-<H2>REFERENCES</H2>
+<H2 id="references">REFERENCES</H2>
+
+<p>The SGI image format specification version 1.0 is at
+ftp://ftp.sgi.com/graphics/grafica/sgiimage.html .
+
+<p>There is an example SGI file at
+https://github.com/ZaaLabs/ZaaIL-TestImages/tree/master/SGI .
-SGI Image File Format documentation (draft v0.95) by Paul Haeberli (<A
-HREF="mailto:p...@sgi.com";>p...@sgi.com</A>). Available via ftp at
-sgi.com:graphics/SGIIMAGESPEC.
-<A NAME="lbAG"> </A>
-<H2>SEE ALSO</H2>
+<H2 id="seealso">SEE ALSO</H2>
<B><A HREF="pnm.html">pnm</A></B>,
+<B><A HREF="pam.html">pam</A></B>,
+<B><A HREF="pnmtosgi.html">pnmtosgi</A></B>,
+<B><A HREF="pamstack.html">pamstack</A></B>
-<B><A HREF="pnmtosgi.html">pnmtosgi</A></B>
-<A NAME="lbAH"> </A>
-<H2>AUTHOR</H2>
+<H2 id="author">AUTHOR</H2>
-<p>Copyright (C) 1994 by Ingo Wilken (<A
-HREF="mailto:ingo.wil...@informatik.uni-oldenburg.de";>ingo.wil...@informatik.uni-oldenburg.de</A>)
+<p>Copyright (C) 1994 by Ingo Wilken
+(<A HREF="mailto:ingo.wil...@informatik.uni-oldenburg.de";>
+ingo.wil...@informatik.uni-oldenburg.de</A>)
<HR>
-<A NAME="index"> </A>
-<H2>Table Of Contents</H2>
+<H2 id="index">Table Of Contents</H2>
<UL>
-<LI><A HREF="#lbAB">NAME</A>
-<LI><A HREF="#lbAC">SYNOPSIS</A>
-<LI><A HREF="#lbAD">DESCRIPTION</A>
-<LI><A HREF="#lbAE">OPTIONS</A>
-<LI><A HREF="#lbAF">REFERENCES</A>
-<LI><A HREF="#lbAG">SEE ALSO</A>
-<LI><A HREF="#lbAH">AUTHOR</A>
+<LI><A HREF="#synopsis">SYNOPSIS</A>
+<LI><A HREF="#description">DESCRIPTION</A>
+<LI><A HREF="#options">OPTIONS</A>
+<LI><A HREF="#references">REFERENCES</A>
+<LI><A HREF="#seealso">SEE ALSO</A>
+<LI><A HREF="#author">AUTHOR</A>
</UL>
</BODY>
</HTML>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm.sourceforge.net/doc/winicontoppm.html
new/netpbm.sourceforge.net/doc/winicontoppm.html
--- old/netpbm.sourceforge.net/doc/winicontoppm.html 2013-04-15
01:59:39.000000000 +0200
+++ new/netpbm.sourceforge.net/doc/winicontoppm.html 2014-03-29
23:18:07.000000000 +0100
@@ -82,7 +82,7 @@
<H2 id="seealso">SEE ALSO</H2>
<B><A HREF="winicontopam.html">winicontopam</A></B>,
-<B><A HREF="ppmtowinicon.html">ppmtowinicon</A></B>,
+<B><A HREF="pamtowinicon.html">pamtowinicon</A></B>,
<B><A HREF="bmptopnm.html">bmptopnm</A></B>,
<B><A HREF="ppm.html">ppm</A></B>
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-04-01
11:09:03.000000000 +0200
+++ new/netpbm.sourceforge.net/getting_netpbm.php 2014-06-23
15:39:44.000000000 +0200
@@ -109,6 +109,10 @@
<p>The project does not distribute tarballs for the other release series.
+<p>You can get Sourceforge to make you a tarball of the current Development
+release. It is a rather quirky feature of <a href="#browsing">browsing</a>
+the code.
+
<p>(Before 2013, there was a way to get a tarball of all the series, using a
Sourceforge feature that generated it from the Subversion repository, but
Sourceforge withdrew that service).
@@ -159,26 +163,20 @@
"advanced" in the above command.
-<h3>Browsing</h3>
+<h3 id="browsing">Browsing</h3>
<p>You can browse the source code one file at a time with
Sourceforge's <a
href="http://sourceforge.net/p/netpbm/code/HEAD/tree";>Subversion web
access</a>.
-
-<h3>Exporting Subversion Repository</h3>
-
-<p>You can download the entire Subversion repository (which contains
-about 100 historical versions of Netpbm source code and the user's guide)
-as a zip file. If the Sourceforge Subversion server is not sufficient for
-you to access the code, this might be. A trial download in May 2013 was
-164 MiB and took 20 minutes to create.
-
-<p>To download the repository, click on "Download Snapshot" at
-<a
href="http://sourceforge.net/p/netpbm/code/";>http://sourceforge.net/p/netpbm/code/</a>.
-The button is at the right end of the title bar that is near the middle of the
-page.
+<p>There is a misleading button in that facility labelled "Download
+Snapshot." at the right end of the title bar that is near the
+middle of the page. You might think that that downloads a snapshot of the
+part of the repository you are viewing, or maybe downloads a snapshot of
+the entire repository, but what it does is download a snapshot of the
+"trunk" directory regardless of what part of the repository
+you are viewing.
<h2>Pre-Built Distributions</h2>
@@ -223,6 +221,19 @@
you can easily add modern Netpbm to your system. (This was new in Netpbm
10.66 - March 2014).
+<p>Furthermore, the Netpbm project distributes a complete Debian install
+package (.deb file) for the x86_64 architecture for the current Super Stable
+release, and it appears to be compatible with Debian 6 (Squeeze) and 7
+(Wheezy). It remains to be seen how well this package works with actual
+Debian systems; the facts that the package is not maintained by the Debian
+project and the Debian project does maintain another version of the package
+are reasons to be skeptical. The Netpbm project has distributed this package
+since March 2014.
+
+<p>You can find the Debian install package in the
+<a href="http://sourceforge.net/projects/netpbm/files/super_stable/";>
+Sourceforge File Release System</a>
+
<p>
Also:
@@ -271,12 +282,16 @@
<li>The <a href="http://www.cygwin.com";>Cygwin project</a> (for the Cygwin
environment). Install it via the regular Cygwin installer (setup.exe).
+<li><a href="mailto:ait_frog-net...@yahoo.com";>Terry Ron Vantreese</a>
+distributes a version based on Mingw32
+<a
href="https://onedrive.live.com/#cid=9E7DB242359A93F0&id=9E7DB242359A93F0!28283";>here</a>
+
<li><a
href="ftp://ftp.sunet.se/pub/simtelnet/gnu/djgpp/v2apps/npbm916s.zip";>sunet</a>'s
archives of former Simtel files: an ancient Netpbm (9.16) built for DJGPP.
<li><a href="http://gnuwin32.sourceforge.net/packages/netpbm.htm";>Netpbm
for Windows using Mingw32 and GNU Bash</a>, distributed by the GnuWin32
-Project.
+Project. Last update 2005.
</ul>
@@ -350,7 +365,7 @@
</address>
<p style="font-size:75%">
-This page was generated on 01 Apr 2014.
+This page was generated on 23 Jun 2014.
</body> </html>
++++++ netpbm-10.66.0-nohpcdtoppm-noppmtompeg.tar.bz2 ->
netpbm-10.66.3-nohpcdtoppm-noppmtompeg.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/GNUmakefile
new/netpbm-10.66.3/GNUmakefile
--- old/netpbm-10.66.0/GNUmakefile 2014-04-01 11:08:58.000000000 +0200
+++ new/netpbm-10.66.3/GNUmakefile 2014-06-23 15:39:39.000000000 +0200
@@ -396,19 +396,19 @@
$(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \
SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
-ifeq ($(STATICLIB_TOO),y)
-BUILD_STATIC = y
+ifeq ($(STATICLIB_TOO),Y)
+BUILD_STATIC = Y
else
ifeq ($(NETPBMLIBTYPE),unixstatic)
- BUILD_STATIC = y
+ BUILD_STATIC = Y
else
- BUILD_STATIC = n
+ BUILD_STATIC = N
endif
endif
.PHONY: install.staticlib
install.staticlib:
-ifeq ($(BUILD_STATIC),y)
+ifeq ($(BUILD_STATIC),Y)
$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/analyzer/pamsharpness.c
new/netpbm-10.66.3/analyzer/pamsharpness.c
--- old/netpbm-10.66.0/analyzer/pamsharpness.c 2014-04-01 11:08:57.000000000
+0200
+++ new/netpbm-10.66.3/analyzer/pamsharpness.c 2014-06-23 15:39:38.000000000
+0200
@@ -151,7 +151,7 @@
computeSharpness(&inpam, tuplenarray, &sharpness);
- pm_message("Sharpness = %f\n", sharpness);
+ printf("Sharpness = %f\n", sharpness);
pnm_freepamarrayn(tuplenarray, &inpam);
pm_close(ifP);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/buildtools/configure.pl
new/netpbm-10.66.3/buildtools/configure.pl
--- old/netpbm-10.66.0/buildtools/configure.pl 2014-04-01 11:08:57.000000000
+0200
+++ new/netpbm-10.66.3/buildtools/configure.pl 2014-06-23 15:39:38.000000000
+0200
@@ -835,16 +835,16 @@
my $response = prompt("(y)es or (n)o", $default);
if (uc($response) =~ /^(Y|YES)$/) {
- $staticlib_too = "y";
+ $staticlib_too = "Y";
} elsif (uc($response) =~ /^(N|NO)$/) {
- $staticlib_too = "n";
+ $staticlib_too = "N";
} else {
print("'$response' isn't one of the choices. \n" .
"You must choose 'yes' or 'no' (or 'y' or 'n').\n");
exit 12;
}
} else {
- $staticlib_too = "n";
+ $staticlib_too = "N";
}
print("\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/config.mk.in
new/netpbm-10.66.3/config.mk.in
--- old/netpbm-10.66.0/config.mk.in 2014-04-01 11:08:57.000000000 +0200
+++ new/netpbm-10.66.3/config.mk.in 2014-06-23 15:39:38.000000000 +0200
@@ -503,7 +503,7 @@
#LINUXSVGALIB = /usr/lib/libvga.so
#LINUXSVGAHDR_DIR = /usr/include/vgalib
-# If you don't want any network functions, set OMIT_NETWORK to "y".
+# If you don't want any network functions, set OMIT_NETWORK to "Y".
# The only thing that requires network functions is the option in
# ppmtompeg to run it on multiple computers simultaneously. On some
# systems network functions don't work or we haven't figured out how to
@@ -512,11 +512,11 @@
#DJGPP/Windows, Tru64:
# (there's some minor header problem that prevents network functions from
# building on Tru64 2000.10.06)
-#OMIT_NETWORK = y
+#OMIT_NETWORK = Y
# These are -l options to link in the network libraries. Often, these are
# built into the standard C library, so this can be null. This is irrelevant
-# if OMIT_NETWORK is "y".
+# if OMIT_NETWORK is "Y".
NETWORKLD =
# Solaris, SunOS:
@@ -602,12 +602,12 @@
# Windows shared library:
#NETPBMLIBSUFFIX = dll
-#STATICLIB_TOO is "y" to signify that you want a static library built
+#STATICLIB_TOO is "Y" to signify that you want a static library built
#and installed in addition to whatever library type you specified by
#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library,
#STATICLIB_TOO simply has no effect.
-STATICLIB_TOO = y
-#STATICLIB_TOO = n
+STATICLIB_TOO = Y
+#STATICLIB_TOO = N
#STATICLIBSUFFIX is the suffix that static libraries have. It's
#meaningless if you aren't building static libraries.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/converter/other/exif.c
new/netpbm-10.66.3/converter/other/exif.c
--- old/netpbm-10.66.0/converter/other/exif.c 2014-04-01 11:09:00.000000000
+0200
+++ new/netpbm-10.66.3/converter/other/exif.c 2014-06-23 15:39:41.000000000
+0200
@@ -87,6 +87,9 @@
#define TAG_ORIENTATION 0x0112
+#define TAG_XRESOLUTION 0x011A
+#define TAG_YRESOLUTION 0x011B
+
#define TAG_EXPOSURETIME 0x829A
#define TAG_FNUMBER 0x829D
@@ -473,15 +476,25 @@
switch(Tag){
case TAG_MAKE:
- strncpy(ImageInfoP->CameraMake, (char*)ValuePtr, 31);
+ STRSCPY(ImageInfoP->CameraMake, (char*)ValuePtr);
break;
case TAG_MODEL:
- strncpy(ImageInfoP->CameraModel, (char*)ValuePtr, 39);
+ STRSCPY(ImageInfoP->CameraModel, (char*)ValuePtr);
break;
+ case TAG_XRESOLUTION:
+ ImageInfoP->XResolution =
+ ConvertAnyFormat(ValuePtr, Format);
+ break;
+
+ case TAG_YRESOLUTION:
+ ImageInfoP->YResolution =
+ ConvertAnyFormat(ValuePtr, Format);
+ break;
+
case TAG_DATETIME_ORIGINAL:
- strncpy(ImageInfoP->DateTime, (char*)ValuePtr, 19);
+ STRSCPY(ImageInfoP->DateTime, (char*)ValuePtr);
ImageInfoP->DatePointer = (char*)ValuePtr;
break;
@@ -839,8 +852,8 @@
if (ImageInfoP->DateTime[0]){
fprintf(stderr, "Date/Time : %s\n",ImageInfoP->DateTime);
}
- fprintf(stderr, "Resolution : %d x %d\n",
- ImageInfoP->Width, ImageInfoP->Height);
+ fprintf(stderr, "Resolution : %f x %f\n",
+ ImageInfoP->XResolution, ImageInfoP->YResolution);
if (ImageInfoP->Orientation > 1){
/* Only print orientation if one was supplied, and if its not
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/converter/other/exif.h
new/netpbm-10.66.3/converter/other/exif.h
--- old/netpbm-10.66.0/converter/other/exif.h 2014-04-01 11:08:59.000000000
+0200
+++ new/netpbm-10.66.3/converter/other/exif.h 2014-06-23 15:39:39.000000000
+0200
@@ -16,7 +16,8 @@
char CameraMake [32];
char CameraModel [40];
char DateTime [20];
- int Height, Width;
+ float XResolution;
+ float YResolution;
int Orientation;
int IsColor;
int FlashUsed;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/converter/other/jbig/Makefile
new/netpbm-10.66.3/converter/other/jbig/Makefile
--- old/netpbm-10.66.0/converter/other/jbig/Makefile 2014-04-01
11:09:00.000000000 +0200
+++ new/netpbm-10.66.3/converter/other/jbig/Makefile 2014-06-23
15:39:41.000000000 +0200
@@ -11,7 +11,9 @@
EXTERN_INCLUDES =
ifneq ($(JBIGHDR_DIR),NONE)
- EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
+ ifneq ($(JBIGHDR_DIR)x,x)
+ EXTERN_INCLUDES += -I$(JBIGHDR_DIR)
+ endif
endif
ifneq ($(JBIGHDR_DIR),NONE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/converter/other/jpeg2000/Makefile
new/netpbm-10.66.3/converter/other/jpeg2000/Makefile
--- old/netpbm-10.66.0/converter/other/jpeg2000/Makefile 2014-04-01
11:08:59.000000000 +0200
+++ new/netpbm-10.66.3/converter/other/jpeg2000/Makefile 2014-06-23
15:39:40.000000000 +0200
@@ -10,16 +10,18 @@
include $(BUILDDIR)/config.mk
EXTERN_INCLUDES =
-ifneq ($(JASPERHDR_DIR),NONE)
- EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
-endif
-
# INTERNAL_JASPERLIB must be relative to the current directory, because it
# may end up in MERGE_OBJECTS, which must be relative.
INTERNAL_JASPERLIB = libjasper/libjasper.a
INTERNAL_JASPERHDR_DIR = $(SRCDIR)/$(SUBDIR)/libjasper/include
+ifneq ($(JASPERHDR_DIR),NONE)
+ ifneq ($(JASPERHDR_DIR)x,x)
+ EXTERN_INCLUDES += -I$(JASPERHDR_DIR)
+ endif
+endif
+
ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB))
ifeq ($(HAVE_INT64),Y)
JASPERLIB_DEP = $(JASPERLIB)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/converter/other/sgitopnm.c
new/netpbm-10.66.3/converter/other/sgitopnm.c
--- old/netpbm-10.66.0/converter/other/sgitopnm.c 2014-04-01
11:09:00.000000000 +0200
+++ new/netpbm-10.66.3/converter/other/sgitopnm.c 2014-06-23
15:39:41.000000000 +0200
@@ -376,7 +376,7 @@
MALLOCARRAY_NOFAIL(image[iindex], head->xsize);
if (table) {
- if (outChannelSpec && channel >= outChannel) {
+ if (!outChannelSpec || channel >= outChannel) {
long const offset = table[sgiIndex].start;
long const length = head->bpc == 2 ?
table[sgiIndex].length / 2 :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/doc/HISTORY
new/netpbm-10.66.3/doc/HISTORY
--- old/netpbm-10.66.0/doc/HISTORY 2014-04-01 11:08:58.000000000 +0200
+++ new/netpbm-10.66.3/doc/HISTORY 2014-06-23 15:39:39.000000000 +0200
@@ -4,6 +4,38 @@
CHANGE HISTORY
--------------
+14.06.15 BJH Release 10.66.03
+
+ sgitopnm: fix bug: no output if input is RLE compressed. Broken
+ in Netpbm 10.53 (December 2010). Thanks Prophet of the Way
+ <a...@wta.att.ne.jp>.
+
+ Build: fix bug in which null value is not taken to mean
+ "in the system search path" for JBIGHDR_DIR and JASPERHDR_DIR.
+
+14.04.24 BJH Release 10.66.02
+
+ pamsharpness: put primary output on Standard Output instead of
+ on Standard Error as a Netpbm message.
+
+ jpegtopnm -dumpexif: fix incorrect display of resolution.
+ Always broken. (-dumpexif was new in Netpbm 9.18 September
+ 2001).
+
+ jpegtopnm -dumpexif: fix truncated make, model, or datetime.
+ Always broken. (-dumpexif was new in Netpbm 9.18 September
+ 2001).
+
+ jpegtopnm -dumpexif: fix wild pointer with invalid EXIF data.
+ Always broken. (-dumpexif was new in Netpbm 9.18 September
+ 2001).
+
+14.04.02 BJH Release 10.66.01
+
+ Build: Fix inconsistent use of upper and lower case Y and N in
+ make variables, causing static library not to get built.
+ Introduced in 10.66.00.
+
14.03.30 BJH Release 10.66.00
Add pamvalidate. Thanks Prophet of the Way <a...@wta.att.ne.jp>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/lib/Makefile
new/netpbm-10.66.3/lib/Makefile
--- old/netpbm-10.66.0/lib/Makefile 2014-04-01 11:08:59.000000000 +0200
+++ new/netpbm-10.66.3/lib/Makefile 2014-06-23 15:39:39.000000000 +0200
@@ -175,7 +175,7 @@
ifeq ($(STATICLIB_TOO),Y)
BUILD_STATICLIB = Y
else
- BUILD_STATICLIB = n
+ BUILD_STATICLIB = N
endif
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/netpbm-10.66.0/version.mk
new/netpbm-10.66.3/version.mk
--- old/netpbm-10.66.0/version.mk 2014-04-01 11:08:58.000000000 +0200
+++ new/netpbm-10.66.3/version.mk 2014-06-23 15:39:39.000000000 +0200
@@ -1,3 +1,3 @@
NETPBM_MAJOR_RELEASE = 10
NETPBM_MINOR_RELEASE = 66
-NETPBM_POINT_RELEASE = 0
+NETPBM_POINT_RELEASE = 3
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
