# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1526009202 -10800
# Node ID 3b220604ae3c1e0828ebda87422359d1c7a8aa01
# Parent  d987a4933e1ca1317be31afa69a5291c40493130
Add short format attribute names to dmC64GetImageTypeString().

diff -r d987a4933e1c -r 3b220604ae3c tools/64vw.c
--- a/tools/64vw.c	Fri May 11 05:46:50 2018 +0300
+++ b/tools/64vw.c	Fri May 11 06:26:42 2018 +0300
@@ -52,7 +52,7 @@
         char buf[64];
         printf("%3d | %-5s | %-15s | %s\n",
             i, fmt->fext,
-            dmC64GetImageTypeString(buf, sizeof(buf), fmt->type),
+            dmC64GetImageTypeString(buf, sizeof(buf), fmt->type, FALSE),
             fmt->name);
     }
 }
diff -r d987a4933e1c -r 3b220604ae3c tools/gfxconv.c
--- a/tools/gfxconv.c	Fri May 11 05:46:50 2018 +0300
+++ b/tools/gfxconv.c	Fri May 11 06:26:42 2018 +0300
@@ -213,7 +213,7 @@
         char buf[64];
         printf("%-5s | %-15s | %s\n",
             fmt->fext,
-            dmC64GetImageTypeString(buf, sizeof(buf), fmt->type),
+            dmC64GetImageTypeString(buf, sizeof(buf), fmt->type, FALSE),
             fmt->name);
     }
 }
diff -r d987a4933e1c -r 3b220604ae3c tools/lib64gfx.c
--- a/tools/lib64gfx.c	Fri May 11 05:46:50 2018 +0300
+++ b/tools/lib64gfx.c	Fri May 11 06:26:42 2018 +0300
@@ -45,7 +45,7 @@
 {
     char typeStr[64];
 
-    dmC64GetImageTypeString(typeStr, sizeof(typeStr), img->type);
+    dmC64GetImageTypeString(typeStr, sizeof(typeStr), img->type, TRUE);
 
     if (fmt != NULL)
     {
@@ -91,12 +91,12 @@
 }
 
 
-char * dmC64GetImageTypeString(char *buf, const size_t len, const int type)
+char * dmC64GetImageTypeString(char *buf, const size_t len, const int type, const BOOL lng)
 {
     snprintf(buf, len,
         "%s%s%s%s",
-        (type & D64_FMT_MC)    ? "MultiColor " : "HiRes ",
-        (type & D64_FMT_ILACE) ? "Interlaced " : "",
+        (type & D64_FMT_MC)    ? (lng ? "MultiColor " : "MC ") : "HiRes ",
+        (type & D64_FMT_ILACE) ? (lng ? "Interlaced " : "ILace ") : "",
         (type & D64_FMT_FLI)   ? "FLI " : "",
         (type & D64_FMT_CHAR)  ? "CHAR" : ""
         );
diff -r d987a4933e1c -r 3b220604ae3c tools/lib64gfx.h
--- a/tools/lib64gfx.h	Fri May 11 05:46:50 2018 +0300
+++ b/tools/lib64gfx.h	Fri May 11 06:26:42 2018 +0300
@@ -197,7 +197,7 @@
 
 void      dmC64ImageDump(FILE *fh, const DMC64Image *img, const DMC64ImageFormat *fmt);
 void      dmSetDefaultC64Palette(DMImage *img);
-char *    dmC64GetImageTypeString(char *buf, const size_t len, const int type);
+char *    dmC64GetImageTypeString(char *buf, const size_t len, const int type, const BOOL lng);
 
 
 DMC64Image *dmC64ImageAlloc(const DMC64ImageFormat *fmt);