# HG changeset patch # User Matti Hamalainen # Date 1530203877 -10800 # Node ID 23a344b5e4f125ef6dd8a6abef41f6a1941febab # Parent c5a46cb4cce506a7432c209174950624cff6185a Cleanups. diff -r c5a46cb4cce5 -r 23a344b5e4f1 tools/lib64gfx.h --- a/tools/lib64gfx.h Thu Jun 28 18:55:21 2018 +0300 +++ b/tools/lib64gfx.h Thu Jun 28 19:37:57 2018 +0300 @@ -145,6 +145,10 @@ } DMC64Sprite; +typedef struct _DMC64ImageCommonFormat DMC64ImageCommonFormat; +typedef struct _DMC64ImageFormat DMC64ImageFormat; + + typedef struct _DMC64Image { int type, // Image type (D64_FMT_*) @@ -173,16 +177,6 @@ } DMC64Image; -typedef Uint8 (*DMC64GetPixelFunc)( - const DMC64Image *img, const int bmoffs, const int scroffs, - const int vshift, const int vbitmap, const int rasterX, const int rasterY); - -#define D64_MAX_ENCDEC_OPS 64 - - -typedef struct _DMC64ImageFormat DMC64ImageFormat; - - typedef struct _DMC64EncDecOp { int type; // Operation type (DO_*) @@ -198,10 +192,16 @@ } DMC64EncDecOp; +#define D64_MAX_ENCDEC_OPS 64 typedef DMC64EncDecOp DMC64EncDecOpList[D64_MAX_ENCDEC_OPS]; -typedef struct +typedef Uint8 (*DMC64GetPixelFunc)( + const DMC64Image *img, const int bmoffs, const int scroffs, + const int vshift, const int vbitmap, const int rasterX, const int rasterY); + + +typedef struct _DMC64ImageCommonFormat { int type; // Type flags, see D64_FMT_* int width, height; // Width and height in pixels