# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1567496481 -10800
# Node ID 5abb81daadd52234149534d6b1fbb7aaca8b7dc9
# Parent  9360a693d8af9dfcac1dfc4fd5ed8456f6d3d7d0
Rename DMC64EncDecOp::offs2 to blkoffs.

diff -r 9360a693d8af -r 5abb81daadd5 tools/lib64gfx.c
--- a/tools/lib64gfx.c	Tue Sep 03 10:40:14 2019 +0300
+++ b/tools/lib64gfx.c	Tue Sep 03 10:41:21 2019 +0300
@@ -1008,33 +1008,33 @@
                         // XXX BZZZT .. a nasty cast here
                         blk = (DMC64MemBlock *) dmC64GetOpMemBlock(img, op->subject, op->bank);
 
-                        if ((dmC64MemBlockReAlloc(blk, op->offs2 + size)) != DMERR_OK)
+                        if ((dmC64MemBlockReAlloc(blk, op->blkoffs + size)) != DMERR_OK)
                         {
                             return dmError(DMERR_MALLOC,
                                 "Could not allocate '%s' block! "
                                 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
-                                subjname, i, op->offs, op->offs, op->bank, op->offs2 + size, op->offs2 + size, buf->len, buf->len);
+                                subjname, i, op->offs, op->offs, op->bank, op->blkoffs + size, op->blkoffs + size, buf->len, buf->len);
                         }
                         switch (op->type)
                         {
                             case DO_COPY:
-                                memcpy(blk->data + op->offs2, src, size);
+                                memcpy(blk->data + op->blkoffs, src, size);
                                 break;
 
                             case DO_SET_MEM:
-                                dmMemset(blk->data + op->offs2, *src, size);
+                                dmMemset(blk->data + op->blkoffs, *src, size);
                                 break;
 
                             case DO_SET_MEM_HI:
-                                dmMemset(blk->data + op->offs2, (*src >> 4) & 0x0f, size);
+                                dmMemset(blk->data + op->blkoffs, (*src >> 4) & 0x0f, size);
                                 break;
 
                             case DO_SET_MEM_LO:
-                                dmMemset(blk->data + op->offs2, *src & 0x0f, size);
+                                dmMemset(blk->data + op->blkoffs, *src & 0x0f, size);
                                 break;
 
                             case DO_SET_OP:
-                                dmMemset(blk->data + op->offs2, op->offs, size);
+                                dmMemset(blk->data + op->blkoffs, op->offs, size);
                                 break;
 
                             default:
@@ -1085,7 +1085,7 @@
                             case DS_D022: img->d022 = value; break;
                             case DS_D023: img->d023 = value; break;
                             case DS_D024: img->d024 = value; break;
-                            case DS_EXTRA_INFO: img->extraInfo[op->offs2] = value; break;
+                            case DS_EXTRA_INFO: img->extraInfo[op->blkoffs] = value; break;
                         }
                         break;
 
@@ -1228,15 +1228,15 @@
                                         subjname, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
                                     goto err;
                                 }
-                                if (op->offs2 + size > blk->size)
+                                if (op->blkoffs + size > blk->size)
                                 {
                                     res = dmError(DMERR_INTERNAL,
                                         "'%s' size mismatch %d <> %d in "
                                         "op #%d, offs=%d ($%04x), bank=%d, offs2=%d ($%02x), size=%d ($%04x)\n",
-                                        subjname, op->offs2 + size, blk->size, i, op->offs, op->offs, op->bank, op->offs2, op->offs2, size, size);
+                                        subjname, op->blkoffs + size, blk->size, i, op->offs, op->offs, op->bank, op->blkoffs, op->blkoffs, size, size);
                                     goto err;
                                 }
-                                memcpy(dst, blk->data + op->offs2, size);
+                                memcpy(dst, blk->data + op->blkoffs, size);
                                 break;
 
                             case DO_SET_MEM:
@@ -1269,7 +1269,7 @@
                             case DS_D022: value = img->d022; break;
                             case DS_D023: value = img->d023; break;
                             case DS_D024: value = img->d024; break;
-                            case DS_EXTRA_INFO: value = img->extraInfo[op->offs2]; break;
+                            case DS_EXTRA_INFO: value = img->extraInfo[op->blkoffs]; break;
                         }
                         switch (op->type)
                         {
diff -r 9360a693d8af -r 5abb81daadd5 tools/lib64gfx.h
--- a/tools/lib64gfx.h	Tue Sep 03 10:40:14 2019 +0300
+++ b/tools/lib64gfx.h	Tue Sep 03 10:41:21 2019 +0300
@@ -242,7 +242,7 @@
     int    offs;     // Offset in "memory"
     int    bank;     // Bank number or extradata index
     size_t size;     // Size of data (0 for "default")
-    size_t offs2;    // Offset in data-block
+    size_t blkoffs;  // Offset in data-block
 
     int (*decFunction)(const struct _DMC64EncDecOp *op, DMC64Image *img, const DMGrowBuf *buf, const DMC64ImageCommonFormat *fmt);
     int (*encFunction)(const struct _DMC64EncDecOp *op, DMGrowBuf *buf, const DMC64Image *img, const DMC64ImageCommonFormat *fmt);