# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1425053558 -7200
# Node ID 2fac0a28ff51aea612b1f5a3d34c14f2a1816a70
# Parent  0ba1ec9b8608caa21a6ff27aa275621cfae0f592# Parent  98e749d990b04822f8f2a58e038c5eed11222204
Merged.

diff -r 0ba1ec9b8608 -r 2fac0a28ff51 tools/gfxconv.c
--- a/tools/gfxconv.c	Fri Feb 27 18:12:20 2015 +0200
+++ b/tools/gfxconv.c	Fri Feb 27 18:12:38 2015 +0200
@@ -152,23 +152,24 @@
 
 static const DMOptArg optList[] =
 {
-    {  0, '?', "help",         "Show this help", OPT_NONE },
-    { 15, 'v', "verbose",      "Increase verbosity", OPT_NONE },
-    {  3, 'o', "output",       "Output filename", OPT_ARGREQ },
-    {  1, 'i', "informat",     "Set input format (sprite[:mc:sc], char[:mc|sc], bitmap[:<bformat>], image)", OPT_ARGREQ },
-    {  2, 'm', "multicolor",   "Input is multicolor / output in multicolor", OPT_NONE },
-    {  4, 's', "skip",         "Skip bytes in input", OPT_ARGREQ },
-    {  5, 'f', "format",       "Output format (see --formats)", OPT_ARGREQ },
-    { 17,  0 , "formats",      "List available input/output formats", OPT_NONE },
-    {  8, 'q', "sequential",   "Output sequential files (image output only)", OPT_NONE },
-    {  6, 'c', "colormap",     "Color mappings (see below for information)", OPT_ARGREQ },
-    {  7, 'n', "numitems",     "How many 'items' to view (default: all)", OPT_ARGREQ },
-    {  9, 'S', "scale",        "Scale output by x (image output only)", OPT_ARGREQ },
-    { 11, 'w', "width",        "Item width (number of items per row, min 1)", OPT_ARGREQ },
-    { 12, 'P', "paletted",     "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
-    { 13, 'B', "bplanes",      "Bits per pixel OR # of bitplanes (certain output formats)", OPT_ARGREQ },
-    { 14, 'I', "interleave",   "Interleave scanlines (default: output whole planes)", OPT_NONE },
-    { 16, 'R', "remap",        "Remap output image colors (-R <(#RRGGBB|index):index>[,<..>][+remove] | -R @map.txt[+remove])", OPT_ARGREQ },
+    {  0, '?', "help",          "Show this help", OPT_NONE },
+    { 15, 'v', "verbose",       "Increase verbosity", OPT_NONE },
+    {  3, 'o', "output",        "Output filename", OPT_ARGREQ },
+    {  1, 'i', "informat",      "Set input format (sprite[:mc:sc], char[:mc|sc], bitmap[:<bformat>], image)", OPT_ARGREQ },
+    {  2, 'm', "multicolor",    "Input is multicolor / output in multicolor", OPT_NONE },
+    {  4, 's', "skip",          "Skip bytes in input", OPT_ARGREQ },
+    {  5, 'f', "format",        "Output format (see --formats)", OPT_ARGREQ },
+    { 17,  0 , "formats",       "List available input/output formats", OPT_NONE },
+    {  8, 'q', "sequential",    "Output sequential files (image output only)", OPT_NONE },
+    {  6, 'c', "colormap",      "Color mappings (see below for information)", OPT_ARGREQ },
+    {  7, 'n', "numitems",      "How many 'items' to output (default: all)", OPT_ARGREQ },
+    { 11, 'w', "width",         "Item width (number of items per row, min 1)", OPT_ARGREQ },
+    {  9, 'S', "scale",         "Scale output image by <n> or <x>:<y> integer factor(s).\n"
+                                "-S <n> scales both height and width by <n>.", OPT_ARGREQ },
+    { 12, 'P', "paletted",      "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
+    { 13, 'B', "bplanes",       "Bits per pixel OR # of bitplanes (certain output formats)", OPT_ARGREQ },
+    { 14, 'I', "interleave",    "Interleave output image scanlines (default: output whole planes)", OPT_NONE },
+    { 16, 'R', "remap",         "Remap output image colors (-R <(#RRGGBB|index):index>[,<..>][+remove] | -R @map.txt[+remove])", OPT_ARGREQ },
 };
 
 static const int optListN = sizeof(optList) / sizeof(optList[0]);