diff tools/lib64gfx.h @ 1482:df6dacb48970

Rename some struct members, and sanitize handling of DMC64Image allocation more.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 11 May 2018 03:29:55 +0300
parents 32203356c652
children bc13af8954d7
line wrap: on
line diff
--- a/tools/lib64gfx.h	Fri May 11 02:49:28 2018 +0300
+++ b/tools/lib64gfx.h	Fri May 11 03:29:55 2018 +0300
@@ -106,7 +106,12 @@
         nbanks;
 
     int width, height; // Width and height in pixels
-    int ch_width, ch_height; // Width and height in charblocks
+    int chWidth, chHeight; // Width and height in charblocks
+
+    size_t
+        screenSize,
+        bitmapSize,
+        charmemSize;
 
     Uint8
         **color,
@@ -153,8 +158,8 @@
     size_t offs;
     int    bank;
     size_t size;
-    BOOL   (*decfunction)(DMC64Image *img, const struct _DMC64EncDecOp *op, const Uint8 *buf, const size_t len);
-    BOOL   (*encfunction)(const struct _DMC64EncDecOp *op, Uint8 **buf, size_t *len, const DMC64Image *img);
+    BOOL   (*decFunction)(DMC64Image *img, const struct _DMC64EncDecOp *op, const Uint8 *buf, const size_t len);
+    BOOL   (*encFunction)(const struct _DMC64EncDecOp *op, Uint8 **buf, size_t *len, const DMC64Image *img);
 } DMC64EncDecOp;
 
 
@@ -168,7 +173,7 @@
     size_t size; // Size, including loading address. Only used in encoding, if even there (0 if no static size)
 
     int width, height; // Width and height in pixels
-    int ch_width, ch_height; // Width and height in charblocks
+    int chWidth, chHeight; // Width and height in charblocks
 
     int  (*probe)(const Uint8 *buf, const size_t len, const struct _DMC64ImageFormat *fmt);