From 5f3f8a1273d87104c0884995e6e58eab392de08b Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sat, 8 May 2021 15:51:06 +0000 Subject: Release 10.94.03 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4099 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/pamtogif.c | 4 ++-- doc/HISTORY | 7 +++++++ lib/util/nstring.c | 28 ++++++++++------------------ version.mk | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/converter/other/pamtogif.c b/converter/other/pamtogif.c index 9b833214..6ec3067b 100644 --- a/converter/other/pamtogif.c +++ b/converter/other/pamtogif.c @@ -91,9 +91,9 @@ pamAlphaPlane(struct pam * const pamP) { if (streq(pamP->tuple_type, "RGB_ALPHA")) alphaPlane = 3; else if (streq(pamP->tuple_type, "GRAYSCALE_ALPHA")) - alphaPlane = 2; + alphaPlane = 1; else if (streq(pamP->tuple_type, "BLACKANDWHITE_ALPHA")) - alphaPlane = 2; + alphaPlane = 1; else alphaPlane = 0; diff --git a/doc/HISTORY b/doc/HISTORY index 51f2ef8b..259e7eec 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +21.05.08 BJH Release 10.94.03 + + pamtogif: Fix failure with bogus message about wrong depth with + grayscale and black and white PAM images with transparency. + Always broken (pamtogif was new in Netpbm 10.37 (December 2006). + Thanks Karol Kosek . + 21.04.08 BJH Release 10.94.02 Build: Fix build failure due to missing 'random' function on diff --git a/lib/util/nstring.c b/lib/util/nstring.c index 6d68af49..1b72d344 100644 --- a/lib/util/nstring.c +++ b/lib/util/nstring.c @@ -6,25 +6,17 @@ Bryan got the base from http://www.ijs.si/software/snprintf/snprintf-2.2.tar.gz, but made a lot of changes and additions. + The code from ww.ijs.si was written by + + Mark Martinec + + in April 1999 and June 2000. Martinec claims copyright as of 1999, 2000, + 2001, and 2002 and licenses the code to Netpbm maintainers and users (as + members of the public) under the GNU General Public License. + + All other authors likewise license this code to the public under the + GNU General Public license. - * AUTHOR - * Mark Martinec , April 1999. - * - * Copyright 1999, Mark Martinec. All rights reserved. - * - * TERMS AND CONDITIONS - * This program is free software; you can redistribute it and/or modify - * it under the terms of the "Frontier Artistic License" which comes - * with this Kit. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the Frontier Artistic License for more details. - * - * You should have received a copy of the Frontier Artistic License - * with this Kit in the file named LICENSE.txt . - * If not, I'll be glad to provide one. * * FEATURES * - careful adherence to specs regarding flags, field width and precision; diff --git a/version.mk b/version.mk index 60aa3d2f..ca284dd8 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 94 -NETPBM_POINT_RELEASE = 2 +NETPBM_POINT_RELEASE = 3 -- cgit 1.4.1