diff tools/64vw.c @ 1488:c71b6c5204af

Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 11 May 2018 05:23:07 +0300
parents 1e7f7489d3e0
children 3b220604ae3c
line wrap: on
line diff
--- a/tools/64vw.c	Fri May 11 04:55:28 2018 +0300
+++ b/tools/64vw.c	Fri May 11 05:23:07 2018 +0300
@@ -164,44 +164,6 @@
 }
 
 
-void dmDumpC64Image(const char *filename, const DMC64Image *img, const DMC64ImageFormat *fmt)
-{
-    char typeStr[64];
-
-    dmC64GetImageTypeString(typeStr, sizeof(typeStr), img->type);
-
-    dmPrint(1,
-        "\n%s\n"
-        "Format              : %s [%s]\n"
-        "Type                : %s\n"
-        "Banks               : %d\n",
-        filename,
-        fmt->name, fmt->fext,
-        typeStr,
-        img->nbanks);
-
-    if (img->type & D64_FMT_ILACE)
-    {
-        char *tmps;
-        switch(img->laceType)
-        {
-            case D64_ILACE_COLOR: tmps = "color"; break;
-            case D64_ILACE_RES: tmps = "resolution"; break;
-            default: tmps = "ERROR"; break;
-        }
-        dmPrint(1,
-            "Interlace type      : %s\n",
-            tmps);
-    }
-
-    dmPrint(1,
-        "Width x Height      : %d x %d\n"
-        "CHwidth x CHheight  : %d x %d\n",
-        img->width, img->height,
-        img->chWidth, img->chHeight);
-}
-
-
 int dmReadC64Image(const char *filename, const DMC64ImageFormat *forced, const DMC64ImageFormat **fmt, DMC64Image **cimage)
 {
     Uint8 *dataBuf = NULL;
@@ -300,7 +262,8 @@
             }
             else
             {
-                dmDumpC64Image(filename, cimage, fmt);
+                fprintf(stdout, "\n%s\n", filename);
+                dmC64ImageDump(stdout, cimage, fmt);
             }
 
             dmC64ImageFree(cimage);
@@ -417,7 +380,11 @@
                     cimage->width, cimage->height,
                     currIndex + 1, noptFilenames2);
 
-                dmDumpC64Image(filename, cimage, fmt);
+                if (dmVerbosity >= 1)
+                {
+                    fprintf(stdout, "\n%s\n", filename);
+                    dmC64ImageDump(stdout, cimage, fmt);
+                }
             }
 
 fail: