Mercurial > hg > dmlib

diff tools/64vw.c @ 2223:5477e792def3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove useless DMC64ImageFormat parameter from some conversion functions.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 14 Jun 2019 12:12:19 +0300
parents b1e392da8346
children a36c81c3df85
line wrap: on
line diff
--- a/tools/64vw.c	Fri Jun 14 12:08:59 2019 +0300
+++ b/tools/64vw.c	Fri Jun 14 12:12:19 2019 +0300
@@ -225,8 +225,7 @@
 }
 
 
-int dmDecodeC64Image(DMC64Image *cimage, const DMC64ImageFormat *fmt,
-    SDL_Surface *surf, const DMC64ImageConvSpec *spec)
+int dmDecodeC64Image(DMC64Image *cimage, SDL_Surface *surf, const DMC64ImageConvSpec *spec)
 {
     DMImage bmap;
     BOOL charDataSet;
@@ -253,10 +252,10 @@
     else
         charDataSet = FALSE;
 
-    if (fmt->format->convertFrom != NULL)
-        res = fmt->format->convertFrom(&bmap, cimage, fmt, spec);
+    if (cimage->fmt->convertFrom != NULL)
+        res = cimage->fmt->convertFrom(&bmap, cimage, spec);
     else
-        res = dmC64ConvertGenericBMP2Image(&bmap, cimage, fmt, spec);
+        res = dmC64ConvertGenericBMP2Image(&bmap, cimage, spec);
 
     if (charDataSet)
         memset(&cimage->charData[0], 0, sizeof(DMC64MemBlock));
@@ -590,7 +589,7 @@
                 goto exit;
             }
 
-            if (dmDecodeC64Image(cimage, fmt, surf, &optSpec) == DMERR_OK)
+            if (dmDecodeC64Image(cimage, surf, &optSpec) == DMERR_OK)
             {
                 title = dm_strdup_printf("%s - [%d / %d] %s (%dx%d @ %s)",
                     dmProgName,