Mercurial > hg > dmlib

diff tools/lib64fmts.c @ 1588:ca087c0cc9c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor the c64 format memory handling a bit for more flexibility.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 14 May 2018 04:27:53 +0300
parents 3c9e5962eca6
children f741dc2d1479
line wrap: on
line diff
--- a/tools/lib64fmts.c	Mon May 14 04:11:45 2018 +0300
+++ b/tools/lib64fmts.c	Mon May 14 04:27:53 2018 +0300
@@ -436,7 +436,7 @@
     return dmC64GetGenericMCPixel(
         img, bmoffs, scroffs, vshift,
         vbank, vbitmap, 0,
-        img->extraData[vb][vr] & 15);
+        img->extraData[vb].data[vr] & 15);
 }
 
 
@@ -460,7 +460,7 @@
     return dmC64GetGenericMCPixel(
         img, bmoffs, scroffs, vshift,
         vbank, vbitmap, 0,
-        img->extraData[vb][vr] & 15);
+        img->extraData[vb].data[vr] & 15);
 }
 
 
@@ -491,7 +491,7 @@
     return dmC64GetGenericMCPixel(
         img, bmoffs, scroffs, vshift,
         vbank, vbitmap, 0,
-        img->extraData[0][raster] & 15);
+        img->extraData[0].data[raster] & 15);
 }
 
 
@@ -509,10 +509,10 @@
 {
     const int vbank = raster & 7;
 
-    if ((img->bitmap[vbitmap][bmoffs] >> vshift) & 1)
-        return img->screen[vbank][scroffs] >> 4;
+    if ((img->bitmap[vbitmap].data[bmoffs] >> vshift) & 1)
+        return img->screen[vbank].data[scroffs] >> 4;
     else
-        return img->screen[vbank][scroffs] & 15;
+        return img->screen[vbank].data[scroffs] & 15;
 }