diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-05-26 04:06:30 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-05-26 04:06:30 +0000 |
commit | aa813fa24371ead6a50fed6080fe82f8ccc7f491 (patch) | |
tree | 1ee32790f7dc75272ecbc06dfb0410a9b917c19a | |
parent | ea2de85aa00a33a4e08badf8443ab6c7f1447be8 (diff) | |
download | netpbm-mirror-aa813fa24371ead6a50fed6080fe82f8ccc7f491.tar.gz netpbm-mirror-aa813fa24371ead6a50fed6080fe82f8ccc7f491.tar.xz netpbm-mirror-aa813fa24371ead6a50fed6080fe82f8ccc7f491.zip |
Release 10.94.05
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4112 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-x | buildtools/debian/mkdeb | 8 | ||||
-rwxr-xr-x | buildtools/stamp-date | 9 | ||||
-rw-r--r-- | converter/other/pamtopng.c | 14 | ||||
-rw-r--r-- | doc/HISTORY | 17 | ||||
-rw-r--r-- | version.mk | 2 |
5 files changed, 32 insertions, 18 deletions
diff --git a/buildtools/debian/mkdeb b/buildtools/debian/mkdeb index b152a78d..6c475530 100755 --- a/buildtools/debian/mkdeb +++ b/buildtools/debian/mkdeb @@ -89,13 +89,7 @@ sub netpbmVersion($) { } else { my $version = <VERSION>; chomp($version); - - if ($version =~ m{^Netpbm (\S*)}) { - my ($versionNumber) = ($1); - $retval = $versionNumber; - } else { - die("Can't understand format of '$versionFileName': '$version'"); - } + $retval = $version; close(VERSION); } diff --git a/buildtools/stamp-date b/buildtools/stamp-date index 902c82e4..f867416d 100755 --- a/buildtools/stamp-date +++ b/buildtools/stamp-date @@ -14,7 +14,14 @@ SOURCE_DATE_OR_NONE=${SOURCE_DATE_EPOCH:-NONE} -BUILD_DATETIME=$(date +%s) +NOW_FROM_DATE_PGM=$(date +%s) +if [ "$NOW_FROM_DATE_PGM" = "%s" ]; then + # This system's 'date' doesn't know %s. (Solaris 10 for example). + # Try Perl + BUILD_DATETIME=$(perl -e 'print time()') +else + BUILD_DATETIME=$NOW_FROM_DATE_PGM +fi LOGNAME_OR_UNKNOWN=${LOGNAME:-UNKNOWN} USER=${USER:-$LOGNAME_OR_UNKNOWN} diff --git a/converter/other/pamtopng.c b/converter/other/pamtopng.c index 327a2b1f..b61ab17b 100644 --- a/converter/other/pamtopng.c +++ b/converter/other/pamtopng.c @@ -50,8 +50,8 @@ struct CmdlineInfo { const char * inputFileName; unsigned int verbose; unsigned int interlace; - unsigned int transparencySpec; - const char * transparency; + unsigned int transparentSpec; + const char * transparent; unsigned int chromaSpec; struct pngx_chroma chroma; unsigned int gammaSpec; @@ -196,8 +196,8 @@ parseCommandLine (int argc, &cmdlineP->verbose, 0); OPTENT3(0, "interlace", OPT_FLAG, NULL, &cmdlineP->interlace, 0); - OPTENT3(0, "transparency", OPT_STRING, &cmdlineP->transparency, - &cmdlineP->transparencySpec, 0); + OPTENT3(0, "transparent", OPT_STRING, &cmdlineP->transparent, + &cmdlineP->transparentSpec, 0); OPTENT3(0, "chroma", OPT_STRING, &chroma, &cmdlineP->chromaSpec, 0); OPTENT3(0, "gamma", OPT_FLOAT, &cmdlineP->gamma, @@ -413,7 +413,7 @@ doTrnsChunk(const struct pam * const pamP, else { xelval const pngMaxval = pm_bitstomaxval(pngx_bitDepth(pngxP)); png_color_16 const pngColor = parseAndScaleColor(trans, pngMaxval); - /* Transparency color from text format scaled from 16-bit to + /* Transparent color from text format scaled from 16-bit to maxval. */ @@ -816,8 +816,8 @@ addAncillaryChunks(struct pam * const pamP, /*---------------------------------------------------------------------------- Where requested, add ancillary chunks. -----------------------------------------------------------------------------*/ - if (cmdline.transparencySpec) - doTrnsChunk(pamP, pngxP,cmdline.transparency); + if (cmdline.transparentSpec) + doTrnsChunk(pamP, pngxP,cmdline.transparent); if (cmdline.chromaSpec) doChrmChunk(pngxP, cmdline.chroma); diff --git a/doc/HISTORY b/doc/HISTORY index a290f5f8..161aad71 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,19 @@ Netpbm. CHANGE HISTORY -------------- +21.05.26 BJH Release 10.94.05 + + pamtopng: Fix -transparent option - program recognized + -transparency instead. Always broken (pamtopng was new in + Netpbm 10.71 (June 2015)). + + Build: make it work on systems that don't have date +%s. Broken + in Netpbm 10.78 (March 2017). Thanks Claes Nästén + (pekdon@gmail.com). + + Mkdeb: fix failure with message about unrecognized format of + VERSION file. Introduced in Netpbm 10.90 (March 2020). + 21.05.15 BJH Release 10.94.04 pamtopng: Fix rejection of all BLACKANDWHITE_ALPHA images with @@ -18,7 +31,7 @@ CHANGE HISTORY pamtopng: Fix: treats all tuple types that start with BLA as BLACKANDWHITE. Always broken (pamtopng was new in Netpbm 10.71 (June 2015)). - + 21.05.08 BJH Release 10.94.03 pamtogif: Fix failure with bogus message about wrong depth with @@ -301,7 +314,7 @@ CHANGE HISTORY won't accept it. Install: Use e.g. "10.90.00" for version in pkg-config and - config file, intead of e.g. "Netpbm 10.90.00". + config file, instead of e.g. "Netpbm 10.90.00". 19.12.29 BJH Release 10.89.00 diff --git a/version.mk b/version.mk index 4aff7cf8..f2c01cf8 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 94 -NETPBM_POINT_RELEASE = 4 +NETPBM_POINT_RELEASE = 5 |