summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac2
-rw-r--r--manpo/da.po68
-rw-r--r--manpo/manpages.pot68
-rw-r--r--options.i1
-rw-r--r--po/da.po14
-rw-r--r--po/xcftools.pot14
-rwxr-xr-xtest/dotest6
9 files changed, 100 insertions, 95 deletions
diff --git a/ChangeLog b/ChangeLog
index ee5cbe6..28b54a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2006-02-20 Henning Makholm <henning@makholm.net>
+ * Version 1.0.1
+ * Make sure that -b with an unknown color actually leads to
+ a fatal error when the X11 color name database is not found.
+
* Version 1.0
* xcfview added
* Support for translated manpages added
diff --git a/configure b/configure
index 28e7b82..9eda24a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Xcftools 1.0.
+# Generated by GNU Autoconf 2.59 for Xcftools 1.0.1.
#
# Report bugs to <henning@makholm.net>.
#
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Xcftools'
PACKAGE_TARNAME='xcftools'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='Xcftools 1.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='Xcftools 1.0.1'
PACKAGE_BUGREPORT='henning@makholm.net'
ac_unique_file="xcfinfo.c"
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Xcftools 1.0 to adapt to many kinds of systems.
+\`configure' configures Xcftools 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -846,7 +846,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xcftools 1.0:";;
+ short | recursive ) echo "Configuration of Xcftools 1.0.1:";;
esac
cat <<\_ACEOF
@@ -976,7 +976,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Xcftools configure 1.0
+Xcftools configure 1.0.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -990,7 +990,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Xcftools $as_me 1.0, which was
+It was created by Xcftools $as_me 1.0.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -6464,7 +6464,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by Xcftools $as_me 1.0, which was
+This file was extended by Xcftools $as_me 1.0.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6527,7 +6527,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Xcftools config.status 1.0
+Xcftools config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 0e44927..3db4bc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
dnl ------------------------
dnl The following line is the MASTER SOURCE for the version number
-AC_INIT(Xcftools,1.0,henning@makholm.net,xcftools)
+AC_INIT(Xcftools,1.0.1,henning@makholm.net,xcftools)
AC_CONFIG_SRCDIR(xcfinfo.c)
AC_PROG_INSTALL
diff --git a/manpo/da.po b/manpo/da.po
index f703d7d..d9258d5 100644
--- a/manpo/da.po
+++ b/manpo/da.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xcftools 0.9.1a\n"
"Report-Msgid-Bugs-To: henning@makholm.net\n"
-"POT-Creation-Date: 2006-02-20 01:59+0100\n"
+"POT-Creation-Date: 2006-02-20 04:06+0100\n"
"PO-Revision-Date: 2006-02-20 02:01+0100\n"
"Last-Translator: Henning Makholm <henning@makholm.net>\n"
"Language-Team: None; proof-of-concept translation by upstream author\n"
@@ -129,7 +129,7 @@ msgstr ""
"B{#rgb}, eller med et X11-farvenavn som slås op i\n"
"B{/usr/lib/X11/rgb.txt}."
-#: options.i:168
+#: options.i:169
msgid ""
"Invent a trivial alpha channel even if the flattened image is\n"
"completely opaque."
@@ -137,7 +137,7 @@ msgstr ""
"Konstruér en triviel gennemsigtighedskanal selvom billedet er\n"
"fuldstændig ugennemsigtigt."
-#: options.i:175
+#: options.i:176
msgid ""
"Force the output to use RGB color space even if it there are more\n"
"compact alternatives."
@@ -145,7 +145,7 @@ msgstr ""
"Brug RGB-format for uddata selvom der er mere kompakte\n"
"alternative formater."
-#: options.i:178
+#: options.i:179
msgid ""
"This will be selected automatically if the output file's name\n"
"ends with B{.ppm}."
@@ -153,27 +153,27 @@ msgstr ""
"Dette bliver valgt automatisk hvis uddatafilens navn ender\n"
"på B{.ppm}."
-#: options.i:187
+#: options.i:188
msgid ""
"Force the output to be a grayscale image even if it may be\n"
"monochrome."
msgstr "Repræsentér uddata som gråtoner selv hvis det er rent sort/hvidt."
-#: options.i:188
+#: options.i:189
msgid "If any colored pixels are encountered, exit with status 103."
msgstr "Stop med afslutningskode 103 hvis der mødes nogen farvede pixels."
-#: options.i:189
+#: options.i:190
msgid ""
"This will be selected automatically if the output file's name\n"
"ends with B{.pgm}."
msgstr "Dette bliver valgt automatisk hvis uddatafilens navn ender på B{.pgm}."
-#: options.i:198
+#: options.i:199
msgid "Force the output to be a monochrome image."
msgstr "Repræsentér uddata som et rent sort/hvidt billede."
-#: options.i:199
+#: options.i:200
msgid ""
"If any colors except black and white are encountered, exit with\n"
"status 103."
@@ -181,13 +181,13 @@ msgstr ""
"Stop med afslutningskode 103 hvis ikke alle pixels er enten sorte\n"
"eller hvide."
-#: options.i:201
+#: options.i:202
msgid ""
"This will be selected automatically if the output file's name\n"
"ends with B{.pbm}."
msgstr "Dette bliver valgt automatisk hvis uddatafilens navn ender på B{.pbm}."
-#: options.i:211
+#: options.i:212
msgid ""
"Suppress the automatic choice of B{-c}, B{-g}, or B{-m} based on\n"
"output filename, and instead select the output format based on\n"
@@ -197,7 +197,7 @@ msgstr ""
"B{-c}, B{-g} og B{-m}, og vælg i stedet et uddataformat på\n"
"grundlag af billedets indhold."
-#: options.i:218
+#: options.i:219
msgid ""
"This is the default if the filename is not recognized, and when\n"
"writing to stdout."
@@ -205,11 +205,11 @@ msgstr ""
"Dette er standardfremgangsmåden hvis filnavnet ikke kan genkendes,\n"
"og når billedet bliver skrevet til standarduddata."
-#: options.i:226
+#: options.i:227
msgid "Use standard RGB compositing for flattening indexed layers."
msgstr "Brug fuldt RGB-farverum til at fladgøre indekserede billeder."
-#: options.i:227
+#: options.i:228
msgid ""
"Without this option, B{%s} will mimic the Gimp's current strategy\n"
"of rounding each alpha value to either full transparency or full\n"
@@ -220,7 +220,7 @@ msgstr ""
"\"helt gennemsigtig\" eller \"helt ugennemsigtig\", og fortolke alle\n"
"lagtilstande som B{Normal}."
-#: options.i:238
+#: options.i:239
msgid ""
"Assert that the flattened image will have no partial transparency\n"
"(allowing a more compact representation of the alpha output)."
@@ -229,7 +229,7 @@ msgstr ""
"(hvilket muliggør en effektivere repræsentation af gennemsigtighed\n"
"i uddata)."
-#: options.i:240
+#: options.i:241
msgid ""
"Exit with status 102 if the flattened image has any partial\n"
"transparency."
@@ -237,7 +237,7 @@ msgstr ""
"Stop med afslutningskode 102 hvis der alligevel findes nogen\n"
"delvist gennemsigtige pixels."
-#: options.i:242
+#: options.i:243
msgid ""
"If B{-b} is also given, this tests whether there there is partial\n"
"transparency before applying the background color."
@@ -245,7 +245,7 @@ msgstr ""
"Hvis B{-b}-flaget også gives, handler denne test om om der er\n"
"delvist gennemsigtige pixels I{over} den angivne baggrund."
-#: options.i:251
+#: options.i:252
msgid ""
"Do a \"dissolve\" step to eliminate partial transparency after\n"
"flattening."
@@ -253,13 +253,13 @@ msgstr ""
"Foretag et \"opløs\"-skridt for at udrydde delvis gennemsigtighed\n"
"i det fladgjorte billede."
-#: options.i:253
+#: options.i:254
msgid ""
"If B{-b} is also given, this happens before the background color\n"
"is applied."
msgstr "Hvis B{-b}-flaget også gives, sker dette før baggrundsfarven påføres."
-#: options.i:261
+#: options.i:262
msgid ""
"First flatten the entire image to a memory buffer before writing\n"
"output. Then analyse the image to decide on the details of the\n"
@@ -269,7 +269,7 @@ msgstr ""
"før detaljerne i uddataformatet bliver besluttet (fx om gråtoner\n"
"er tilstrækkeligt til at repræsentere billeder)."
-#: options.i:264
+#: options.i:265
msgid ""
"Without this option, the program flattens only a singe row of\n"
"\"tiles\" (height 64) at a time."
@@ -277,19 +277,19 @@ msgstr ""
"Hvis dette flag ikke gives, vil programmet nøjes med at fladgøre\n"
"en enkelt række \"fliser\" (af højden 64 pixels) ad gangen."
-#: options.i:271
+#: options.i:272
msgid "wB{x}h"
msgstr "bB{x}h"
-#: options.i:271
+#: options.i:272
msgid "Crop the converted image to width I{w} and height I{h}."
msgstr "Beskær det konverterede billede til bredde I{b} og højde I{b}."
-#: options.i:286
+#: options.i:287
msgid "xB{,}y"
msgstr "xB{,}y"
-#: options.i:286
+#: options.i:287
msgid ""
"Offset the converted part of the image from the top-left corner\n"
"of the XCF canvas. Usually used with B{-S}."
@@ -297,19 +297,19 @@ msgstr ""
"Forskyd det konverterede billede fra det øverste venstre\n"
"hjørne af XCF-lærredet. Bruges normalt sammen med B{-S}."
-#: options.i:307
+#: options.i:308
msgid "mode"
msgstr "tilstand"
-#: options.i:307
+#: options.i:308
msgid "Set the layer mode (e.g., B{Normal} or B{Multiply})."
msgstr "Vælg lagtilstanden (fx B{Normal} eller B{LægTil})."
-#: options.i:330 options.i:344
+#: options.i:331 options.i:345
msgid "n"
msgstr "n"
-#: options.i:330
+#: options.i:331
msgid ""
"Set the opacity on a scale from 0 to 100 (as in the Gimp user\n"
"interface)."
@@ -317,21 +317,21 @@ msgstr ""
"Vælg gennemsigtighed på en skala fra 0 (helt gennemsigtigt)\n"
"til 100 (helt ugennemsigtig)."
-#: options.i:344
+#: options.i:345
msgid "Set the opacity on a scale from 0 to 255 (as used internally)"
msgstr ""
"Vælg gennemsigtighed på en skala fra 0 (helt gennemsigtigt)\n"
"til 255 (helt ugennemsigtig)."
-#: options.i:358
+#: options.i:359
msgid "Enable the layer mask."
msgstr "Aktivér lagmasken."
-#: options.i:364
+#: options.i:365
msgid "Disable the layer mask."
msgstr "Deaktivér lagmasken."
-#: options.i:374
+#: options.i:375
msgid ""
"Use the raw UTF-8 representation from the XCF file to compare and\n"
"display layer names."
@@ -339,7 +339,7 @@ msgstr ""
"Brug den rå UTF-8-repræsentation fra XCF-filen til at sammenligne\n"
"og vise lagnavne."
-#: options.i:376
+#: options.i:377
msgid ""
"Ordinarily, layer names will be converted to the character set of\n"
"the current locale."
diff --git a/manpo/manpages.pot b/manpo/manpages.pot
index 5c1b994..21bc966 100644
--- a/manpo/manpages.pot
+++ b/manpo/manpages.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Xcftools-manpages VERSION\n"
"Report-Msgid-Bugs-To: henning@makholm.net\n"
-"POT-Creation-Date: 2006-02-20 01:59+0100\n"
+"POT-Creation-Date: 2006-02-20 04:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,158 +100,158 @@ msgid "The color can be given as B{#rrggbb} or B{#rgb} hexadecimal\n"
"B{/usr/lib/X11/rgb.txt}."
msgstr ""
-#: options.i:168
+#: options.i:169
msgid "Invent a trivial alpha channel even if the flattened image is\n"
"completely opaque."
msgstr ""
-#: options.i:175
+#: options.i:176
msgid "Force the output to use RGB color space even if it there are more\n"
"compact alternatives."
msgstr ""
-#: options.i:178
+#: options.i:179
msgid "This will be selected automatically if the output file's name\n"
"ends with B{.ppm}."
msgstr ""
-#: options.i:187
+#: options.i:188
msgid "Force the output to be a grayscale image even if it may be\n"
"monochrome."
msgstr ""
-#: options.i:188
+#: options.i:189
msgid "If any colored pixels are encountered, exit with status 103."
msgstr ""
-#: options.i:189
+#: options.i:190
msgid "This will be selected automatically if the output file's name\n"
"ends with B{.pgm}."
msgstr ""
-#: options.i:198
+#: options.i:199
msgid "Force the output to be a monochrome image."
msgstr ""
-#: options.i:199
+#: options.i:200
msgid "If any colors except black and white are encountered, exit with\n"
"status 103."
msgstr ""
-#: options.i:201
+#: options.i:202
msgid "This will be selected automatically if the output file's name\n"
"ends with B{.pbm}."
msgstr ""
-#: options.i:211
+#: options.i:212
msgid "Suppress the automatic choice of B{-c}, B{-g}, or B{-m} based on\n"
"output filename, and instead select the output format based on\n"
"image contents."
msgstr ""
-#: options.i:218
+#: options.i:219
msgid "This is the default if the filename is not recognized, and when\n"
"writing to stdout."
msgstr ""
-#: options.i:226
+#: options.i:227
msgid "Use standard RGB compositing for flattening indexed layers."
msgstr ""
-#: options.i:227
+#: options.i:228
msgid "Without this option, B{%s} will mimic the Gimp's current strategy\n"
"of rounding each alpha value to either full transparency or full\n"
"opacity, and interpret all layer modes as B{Normal}."
msgstr ""
-#: options.i:238
+#: options.i:239
msgid "Assert that the flattened image will have no partial transparency\n"
"(allowing a more compact representation of the alpha output)."
msgstr ""
-#: options.i:240
+#: options.i:241
msgid "Exit with status 102 if the flattened image has any partial\n"
"transparency."
msgstr ""
-#: options.i:242
+#: options.i:243
msgid "If B{-b} is also given, this tests whether there there is partial\n"
"transparency before applying the background color."
msgstr ""
-#: options.i:251
+#: options.i:252
msgid "Do a \"dissolve\" step to eliminate partial transparency after\n"
"flattening."
msgstr ""
-#: options.i:253
+#: options.i:254
msgid "If B{-b} is also given, this happens before the background color\n"
"is applied."
msgstr ""
-#: options.i:261
+#: options.i:262
msgid "First flatten the entire image to a memory buffer before writing\n"
"output. Then analyse the image to decide on the details of the\n"
"output format (e.g., whether a grayscale output is sufficient)."
msgstr ""
-#: options.i:264
+#: options.i:265
msgid "Without this option, the program flattens only a singe row of\n"
"\"tiles\" (height 64) at a time."
msgstr ""
-#: options.i:271
+#: options.i:272
msgid "wB{x}h"
msgstr ""
-#: options.i:271
+#: options.i:272
msgid "Crop the converted image to width I{w} and height I{h}."
msgstr ""
-#: options.i:286
+#: options.i:287
msgid "xB{,}y"
msgstr ""
-#: options.i:286
+#: options.i:287
msgid "Offset the converted part of the image from the top-left corner\n"
"of the XCF canvas. Usually used with B{-S}."
msgstr ""
-#: options.i:307
+#: options.i:308
msgid "mode"
msgstr ""
-#: options.i:307
+#: options.i:308
msgid "Set the layer mode (e.g., B{Normal} or B{Multiply})."
msgstr ""
-#: options.i:330 options.i:344
+#: options.i:331 options.i:345
msgid "n"
msgstr ""
-#: options.i:330
+#: options.i:331
msgid "Set the opacity on a scale from 0 to 100 (as in the Gimp user\n"
"interface)."
msgstr ""
-#: options.i:344
+#: options.i:345
msgid "Set the opacity on a scale from 0 to 255 (as used internally)"
msgstr ""
-#: options.i:358
+#: options.i:359
msgid "Enable the layer mask."
msgstr ""
-#: options.i:364
+#: options.i:365
msgid "Disable the layer mask."
msgstr ""
-#: options.i:374
+#: options.i:375
msgid "Use the raw UTF-8 representation from the XCF file to compare and\n"
"display layer names."
msgstr ""
-#: options.i:376
+#: options.i:377
msgid "Ordinarily, layer names will be converted to the character set of\n"
"the current locale."
msgstr ""
diff --git a/options.i b/options.i
index 1ba4cf5..761478b 100644
--- a/options.i
+++ b/options.i
@@ -153,6 +153,7 @@ OPTION('b',--background,(color) select background color,
} while( clen == 0 || strcasecmp(colorbuf+clen,optarg) != 0 );
} else {
fprintf(stderr,_("Could not open color database file %s\n"),filename);
+ r = (unsigned)-1 ;
}
}
if( r == (unsigned)-1 )
diff --git a/po/da.po b/po/da.po
index 9d1ab09..f1aad3f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xcftools 0.9\n"
"Report-Msgid-Bugs-To: henning@makholm.net\n"
-"POT-Creation-Date: 2006-02-20 00:27+0100\n"
+"POT-Creation-Date: 2006-02-20 04:06+0100\n"
"PO-Revision-Date: 2006-02-15 18:32+0100\n"
"Last-Translator: Henning Makholm <henning@makholm.net>\n"
"Language-Team: Til test af l10n-faciliteter; ikke vedligeholdt\n"
@@ -162,32 +162,32 @@ msgstr "deaktivér lagmaske"
msgid "Could not open color database file %s\n"
msgstr "Kunne ikke åbne farvenavnsdatabasen %s\n"
-#: options.i:159
+#: options.i:160
#, c-format
msgid "Unknown background color '%s'"
msgstr "Ukendt baggrundsfarve »%s«"
-#: options.i:281
+#: options.i:282
#, c-format
msgid "-S option must have an argument of the form wxh"
msgstr "-S-flaget skal have et argument på formen bxh"
-#: options.i:298
+#: options.i:299
#, c-format
msgid "-O option must have an argument of the form x,y"
msgstr "-O-flaget skal have et argument på formen x,y"
-#: options.i:322
+#: options.i:323
#, c-format
msgid "Layer mode '%s' is unknown"
msgstr "Lagtilstanden »%s« er ukendt"
-#: options.i:338
+#: options.i:339
#, c-format
msgid "The argument to --percent is not a percentage"
msgstr "Argumentet til --percent er ikke et procenttal"
-#: options.i:351
+#: options.i:352
#, c-format
msgid "The argument to --opacity is not a number between 0 and 255"
msgstr "Argumentet til --opacity er ikke et tal mellem 0 og 255"
diff --git a/po/xcftools.pot b/po/xcftools.pot
index 3d1e8f9..b376efd 100644
--- a/po/xcftools.pot
+++ b/po/xcftools.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: henning@makholm.net\n"
-"POT-Creation-Date: 2006-02-20 00:27+0100\n"
+"POT-Creation-Date: 2006-02-20 04:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -163,32 +163,32 @@ msgstr ""
msgid "Could not open color database file %s\n"
msgstr ""
-#: options.i:159
+#: options.i:160
#, c-format
msgid "Unknown background color '%s'"
msgstr ""
-#: options.i:281
+#: options.i:282
#, c-format
msgid "-S option must have an argument of the form wxh"
msgstr ""
-#: options.i:298
+#: options.i:299
#, c-format
msgid "-O option must have an argument of the form x,y"
msgstr ""
-#: options.i:322
+#: options.i:323
#, c-format
msgid "Layer mode '%s' is unknown"
msgstr ""
-#: options.i:338
+#: options.i:339
#, c-format
msgid "The argument to --percent is not a percentage"
msgstr ""
-#: options.i:351
+#: options.i:352
#, c-format
msgid "The argument to --opacity is not a number between 0 and 255"
msgstr ""
diff --git a/test/dotest b/test/dotest
index 9a9d38d..1e53549 100755
--- a/test/dotest
+++ b/test/dotest
@@ -262,12 +262,12 @@ rgbfile=/usr/lib/X11/rgb.txt
> expected.stderr
echo "${XCFTOOLS_PREFIX}xcf2pnm: Unknown background color 'Plaid'" \
>> expected.stderr
-errtest 20 xcf2pnm $S/tiletext.xcf.gz -b Plaid
+errtest 20 xcf2pnm $S/tiletest.xcf.gz -b Plaid
echo > expected:stderr \
"-S option must have an argument of the form wxh"
-errtest 20 xcf2pnm $S/tiletext.xcf.gz -S 10x
-errtest 20 xcf2pnm $S/tiletext.xcf.gz -S 10x20x30
+errtest 20 xcf2pnm $S/tiletest.xcf.gz -S 10x
+errtest 20 xcf2pnm $S/tiletest.xcf.gz -S 10x20x30
echo > expected:stderr \
"-O option must have an argument of the form x,y"