# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1526001675 -10800
# Node ID 1e7f7489d3e07004bc0869972b84b0292fd8c0e3
# Parent  df6dacb48970e1bb77618610645c0b7499d4bc78
Improve dmC64GetImageTypeString() and use it also in 64vw.

diff -r df6dacb48970 -r 1e7f7489d3e0 tools/64vw.c
--- a/tools/64vw.c	Fri May 11 03:29:55 2018 +0300
+++ b/tools/64vw.c	Fri May 11 04:21:15 2018 +0300
@@ -168,13 +168,7 @@
 {
     char typeStr[64];
 
-    snprintf(typeStr, sizeof(typeStr),
-        "%s%s%s%s",
-        ((img->type & D64_FMT_MC) ? "MultiColor" : "Hires"),
-        ((img->type & D64_FMT_ILACE) ? " Interlaced" : ""),
-        ((img->type & D64_FMT_FLI) ? " FLI" : ""),
-        ((img->type & D64_FMT_CHAR) ? " CHAR" : "")
-        );
+    dmC64GetImageTypeString(typeStr, sizeof(typeStr), img->type);
 
     dmPrint(1,
         "\n%s\n"
diff -r df6dacb48970 -r 1e7f7489d3e0 tools/lib64gfx.c
--- a/tools/lib64gfx.c	Fri May 11 03:29:55 2018 +0300
+++ b/tools/lib64gfx.c	Fri May 11 04:21:15 2018 +0300
@@ -155,10 +155,10 @@
 {
     snprintf(buf, len,
         "%s%s%s%s",
-        (type & D64_FMT_FLI) ? "FLI " : "",
-        (type & D64_FMT_MC) ? "MCol " : "HiRes ",
-        (type & D64_FMT_ILACE) ? "Ilace " : "",
-        (type & D64_FMT_CHAR) ? "CharMap" : ""
+        (type & D64_FMT_MC)    ? "MultiColor " : "HiRes ",
+        (type & D64_FMT_ILACE) ? "Interlaced " : "",
+        (type & D64_FMT_FLI)   ? "FLI " : "",
+        (type & D64_FMT_CHAR)  ? "CHAR" : ""
         );
 
     return buf;