Mercurial > hg > dmlib

changeset 2179:8d53da5bf067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Also rename dmC64ImageGetNumBanks() to *Blocks().
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 12 Jun 2019 17:55:01 +0300
parents e1b7c021db8a
children 33cf1b330b7b
files tools/lib64gfx.c tools/lib64gfx.h
diffstat 2 files changed, 22 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/tools/lib64gfx.c	Wed Jun 12 17:19:07 2019 +0300
+++ b/tools/lib64gfx.c	Wed Jun 12 17:55:01 2019 +0300
@@ -126,9 +126,9 @@
 
         fprintf(fh,
             "%sType                : %s\n"
-            "%sBanks               : %d\n",
+            "%sInternal blocks     : %d\n",
             indent, typeStr,
-            indent, img->nbanks);
+            indent, img->nblocks);
 
         if (img->fmt->type & D64_FMT_ILACE)
         {
@@ -229,20 +229,20 @@
 }
 
 
-int dmC64ImageGetNumBanks(const DMC64ImageFormat *fmt)
+int dmC64ImageGetNumBlocks(const DMC64ImageFormat *fmt)
 {
-    int nbanks = 0;
+    int nblocks = 0;
     for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
     {
         const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
         if (op->type == DO_LAST)
             break;
 
-        if (op->bank > nbanks)
-            nbanks = op->bank;
+        if (op->bank > nblocks)
+            nblocks = op->bank;
     }
 
-    return nbanks + 1;
+    return nblocks + 1;
 }
 
 
@@ -307,13 +307,13 @@
 
     // Initialize image information
     img->fmt         = fmt->format;
-    img->nbanks      = dmC64ImageGetNumBanks(fmt);
+    img->nblocks     = dmC64ImageGetNumBlocks(fmt);
 
     // Allocate banks
-    if ((img->color = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL ||
-        (img->bitmap = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL ||
-        (img->screen = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL ||
-        (img->charData = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL)
+    if ((img->color = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL ||
+        (img->bitmap = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL ||
+        (img->screen = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL ||
+        (img->charData = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL)
         goto err;
 
     return img;
@@ -329,7 +329,7 @@
     if (img != NULL)
     {
         // Free the allocated areas
-        for (int i = 0; i < img->nbanks; i++)
+        for (int i = 0; i < img->nblocks; i++)
         {
             dmC64MemBlockFree(&img->color[i]);
             dmC64MemBlockFree(&img->bitmap[i]);
@@ -849,11 +849,11 @@
                 case DS_BITMAP_RAM:
                 case DS_SCREEN_RAM:
                 case DS_CHAR_DATA:
-                    if (op->bank < 0 || op->bank > img->nbanks)
+                    if (op->bank < 0 || op->bank > img->nblocks)
                     {
                         return dmError(DMERR_INTERNAL,
                             "Invalid bank %d / %d definition in generic encode/decode operator %d @ #%d.\n",
-                            op->bank, img->nbanks, op->type, i);
+                            op->bank, img->nblocks, op->type, i);
                     }
                     break;
 
@@ -976,7 +976,7 @@
 
 const DMC64MemBlock * dmC64GetOpMemBlock(const DMC64Image *img, const int subject, const int bank)
 {
-    if (bank >= 0 && bank < img->nbanks)
+    if (bank >= 0 && bank < img->nblocks)
     {
         switch (subject)
         {
@@ -1000,7 +1000,7 @@
         return DMERR_NULLPTR;
 
     // Clear the image structure, set basics
-    img->nbanks    = dmC64ImageGetNumBanks(fmt);
+    img->nblocks    = dmC64ImageGetNumBlocks(fmt);
 
     // Perform decoding
     for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
@@ -1145,7 +1145,7 @@
                         break;
 
                     case D64_CHCFG_LINEAR:
-                        for (int bank = 0; bank < img->nbanks; bank++)
+                        for (int bank = 0; bank < img->nblocks; bank++)
                         {
                             for (int offs = 0; offs < fmt->format->chHeight * fmt->format->chWidth; offs++)
                                 img->screen[bank].data[offs] = offs & 0xff;
--- a/tools/lib64gfx.h	Wed Jun 12 17:19:07 2019 +0300
+++ b/tools/lib64gfx.h	Wed Jun 12 17:55:01 2019 +0300
@@ -179,9 +179,10 @@
 {
     DMC64ImageCommonFormat *fmt;
     int laceType,            // Interlace type (D64_ILACE_*)
-        nbanks;              // Number of video banks used
+        nblocks,             // Number of internal blocks used
+        nbanks;              // Number of videobanks used
 
-    // Bitmaps, color RAM, screen, etc. blocks * nbanks
+    // Bitmaps, color RAM, screen, etc. blocks * nblocks
     // Not all of them may be allocated
     DMC64MemBlock
         *color,
@@ -342,7 +343,7 @@
 int       dmSetMixedColorC64Palette(DMImage *img);
 
 BOOL      dmCompareAddr16(const DMGrowBuf *buf, const size_t offs, const Uint16 addr);
-int       dmC64ImageGetNumBanks(const DMC64ImageFormat *fmt);
+int       dmC64ImageGetNumBlocks(const DMC64ImageFormat *fmt);
 
 // C64 bitmap image allocation/freeing
 int       dmC64MemBlockAlloc(DMC64MemBlock *blk, const size_t size);