dmlib: tools/lib64fmts.c annotate

annotate tools/lib64fmts.c @ 2628:00b21276f2c0

Cleanup.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 29 Nov 2023 21:35:37 +0200
parents	262395b86b7c
children	07c85fffd805

rev	line source
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Functions for reading and converting various restricted
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * C64/etc and/or indexed/paletted graphics formats.
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * Programmed and designed by Matti 'ccr' Hamalainen
2601 8b99ddcc9fde Bump copyright year. Matti Hamalainen <ccr@tnsp.org> parents: 2599 diff changeset	5 * (C) Copyright 2012-2023 Tecnic Software productions (TNSP)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 *
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 * Please read file 'COPYING' for information on license and distribution.
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 */
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "lib64gfx.h"
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	11 #define DM_MEMCMP_SIZE(mptr, mcmp) memcmp((mptr), (mcmp), sizeof(mcmp))
7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	12 #define DM_MEMCMP_LEN(mptr, mcmp) memcmp((mptr), (mcmp), strlen(mcmp))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
2301 d71185584d95 Comment the necessity of fmtProbeGigapaintHires().. Matti Hamalainen <ccr@tnsp.org> parents: 2300 diff changeset	14
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	15 #define XX2_MIN_SIZE 4000
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	16 #define XX2_WIDTH_CH 40
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	17 #define XX2_HEIGHT_CH 10
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	18 #define XX2_SIZE (XX2_WIDTH_CH * XX2_HEIGHT_CH)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	19 #define XX2_BSIZE (XX2_SIZE * 8)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	20
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	21
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	22 static int fmtProbeFormatXX2(const DMGrowBuf buf, const DMC64ImageFormat fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	23 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	24 if (buf->len >= XX2_MIN_SIZE &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	25 buf->len <= XX2_MIN_SIZE + 8 &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	26 dmCompareAddr16(buf, 0, fmt->addr))
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	27 return DM_PROBE_SCORE_MAYBE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	28
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	29 return DM_PROBE_SCORE_FALSE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	30 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	31
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	32
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	33 static int fmtDecodeFormatXX2(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	34 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	35 int res;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	36 DMGrowBuf tmp;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	37
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	38 // If there is only data for less than XX2_MIN_SIZE bytes,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	39 // allocate a buffer of that size and copy data there.
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	40 // Otherwise allocate len bytes.
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	41 if (dmGrowBufCopy(&tmp, buf, buf->len < XX2_MIN_SIZE ? XX2_MIN_SIZE - buf->len : 0) == NULL)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	42 return DMERR_MALLOC;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	43
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	44 tmp.len = tmp.size;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	45 res = dmC64DecodeGenericBMP(img, &tmp, fmt);
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	46 dmGrowBufFree(&tmp);
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	47 return res;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	48 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	49
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	50
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	51 static const Uint8 fmtFormatXX3_MagicID_1[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	52 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	53 0x01, 0x08, 0x0B, 0x08, 0xF0, 0x02, 0x9E, 0x32,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	54 0x30, 0x36, 0x31, 0x00, 0x00, 0x00, 0xA9, 0x14,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	55 0x8D, 0x18, 0xD0, 0xA2, 0x00, 0xA9, 0x20, 0x9D,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	56 0x00, 0x04, 0x9D, 0x00, 0x05, 0x9D, 0x00, 0x06,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	57 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	58
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	59 static int fmtProbeFormatXX3(const DMGrowBuf buf, const DMC64ImageFormat fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	60 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	61 if (buf->len == fmt->size &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	62 DM_MEMCMP_SIZE(buf->data, fmtFormatXX3_MagicID_1) == 0
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	63 )
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	64 return DM_PROBE_SCORE_MAX;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	65
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	66 return DM_PROBE_SCORE_FALSE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	67 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	68
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	69
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	70 static const Uint8 fmtFormatXX4_MagicID_1[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	71 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	72 0x00, 0x1f, 0x78, 0xa9, 0x3b, 0x8d, 0x11, 0xd0,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	73 0xa9, 0x18, 0x8d, 0x16, 0xd0, 0xa9, 0x18, 0x8d,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	74 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	75
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	76 static int fmtProbeFormatXX4(const DMGrowBuf buf, const DMC64ImageFormat fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	77 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	78 if (buf->len >= fmt->size &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	79 DM_MEMCMP_SIZE(buf->data, fmtFormatXX4_MagicID_1) == 0
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	80 )
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	81 return DM_PROBE_SCORE_MAX;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	82
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	83 return DM_PROBE_SCORE_FALSE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	84 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	85
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	86
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	87 static const Uint8 fmtFormatXX5_MagicID_1[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	88 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	89 0x00, 0x10, 0xa9, 0x01, 0x8d, 0x86, 0x02, 0x20,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	90 0x44, 0xe5, 0xa9, 0x16, 0x8d, 0x18, 0xd0, 0xa2,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	91 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	92
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	93 static int fmtProbeFormatXX5(const DMGrowBuf buf, const DMC64ImageFormat fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	94 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	95 if (buf->len >= fmt->size &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	96 DM_MEMCMP_SIZE(buf->data, fmtFormatXX5_MagicID_1) == 0
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	97 )
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	98 return DM_PROBE_SCORE_MAX;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	99
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	100 return DM_PROBE_SCORE_FALSE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	101 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	102
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	103
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	104 static int fmtGetPixelXX5(DMC64ScanLine *scan,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	105 const DMC64Image *img, const int rasterX, const int rasterY)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	106 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	107 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	108
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	109 #if 1
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	110 (void) vshift;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	111
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	112 return dmC64GetGenericMCPixel(scan->col, img,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	113 bmoffs, scroffs,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	114 6 - (rasterX & 6),
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	115 // (rasterY & 7) + (8 * (rasterX & 1)),
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	116 (rasterY & 7),
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	117 rasterX & 1, 0, img->bgcolor);
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	118 #else
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	119 const int vbank = rasterY & 7;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	120 Uint8 color1, color2, bgcol = img->bgcolor;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	121 int res;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	122
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	123 if ((res = dmC64GetGenericMCPixel(&color1, img, bmoffs, scroffs, vshift, vbank , rasterX & 1, 0, bgcol)) != DMERR_OK \|\|
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	124 (res = dmC64GetGenericMCPixel(&color2, img, bmoffs, scroffs, vshift, vbank + 8, rasterX & 1, 0, bgcol)) != DMERR_OK)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	125 return res;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	126
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	127 (scan->col) = (color1 D64_NCOLORS) + color2;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	128
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	129 return res;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	130 #endif
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	131 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	132
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	133
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	134 static const Uint8 fmtFormatXX6_MagicID_1[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	135 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	136 0x01, 0x08, 0x0b, 0x08, 0xd5, 0x07, 0x9e, 0x34,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	137 0x30, 0x39, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	138 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	139
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	140 static const Uint8 fmtFormatXX6_MagicID_2[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	141 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	142 0x00, 0xAD, 0x10, 0x47, 0x8D, 0x21, 0xD0, 0xA9,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	143 0x00, 0x8D, 0x20, 0xD0, 0xA2, 0x00, 0xBD, 0x40,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	144 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	145
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	146 static int fmtProbeFormatXX6(const DMGrowBuf buf, const DMC64ImageFormat fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	147 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	148 if (buf->len == fmt->size &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	149 DM_MEMCMP_SIZE(buf->data + 0x0000, fmtFormatXX6_MagicID_1) == 0 &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	150 DM_MEMCMP_SIZE(buf->data + 0x0800, fmtFormatXX6_MagicID_2) == 0
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	151 )
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	152 return DM_PROBE_SCORE_MAX;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	153
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	154 return DM_PROBE_SCORE_FALSE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	155 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	156
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	157
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	158 static const Uint8 fmtFormatXX7_MagicID_1[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	159 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	160 0x01, 0x08, 0x0b, 0x08, 0xe0, 0x02, 0x9e, 0x32,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	161 0x30, 0x36, 0x31, 0x00, 0x00, 0x00, 0xa2, 0x19,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	162 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	163
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	164 static const Uint8 fmtFormatXX7_MagicID_2[] =
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	165 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	166 0xa2, 0x60, 0xa9, 0x00, 0x20, 0x10, 0x0a, 0xa9,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	167 0x26, 0xa2, 0x0a, 0x20, 0x10, 0x0a, 0xa2, 0x1f,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	168 };
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	169
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	170 static int fmtProbeFormatXX7(const DMGrowBuf buf, const DMC64ImageFormat fmt)
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	171 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	172 if (buf->len == fmt->size &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	173 DM_MEMCMP_SIZE(buf->data + 0x0000, fmtFormatXX7_MagicID_1) == 0 &&
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	174 DM_MEMCMP_SIZE(buf->data + 0x0100, fmtFormatXX7_MagicID_2) == 0
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	175 )
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	176 return DM_PROBE_SCORE_MAX;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	177
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	178 return DM_PROBE_SCORE_FALSE;
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	179 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	180
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	181
2627 262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	182 static const Uint8 fmtFormatXX9_MagicID_1[] =
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	183 {
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	184 0x01, 0x08, 0x0b, 0x08, 0xe0, 0x02, 0x9e, 0x32,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	185 0x30, 0x36, 0x31, 0x00, 0x00, 0x00, 0xa2, 0x19,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	186 0xb5, 0x02, 0x9d, 0x6f, 0x31, 0xca, 0x10, 0xf8,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	187 0xa9, 0x0e, 0x20, 0xd2, 0xff, 0xa5, 0x01, 0x48,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	188 0x29, 0xf8, 0x09, 0x06, 0x85, 0x01, 0x20, 0x65,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	189 0x08, 0x68, 0x8d, 0x8e, 0x31, 0xba, 0x8e, 0x8d,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	190 };
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	191
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	192 static int fmtProbeFormatXX9(const DMGrowBuf buf, const DMC64ImageFormat fmt)
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	193 {
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	194 if (buf->len == fmt->size &&
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	195 DM_MEMCMP_SIZE(buf->data, fmtFormatXX9_MagicID_1) == 0
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	196 )
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	197 return DM_PROBE_SCORE_MAX;
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	198
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	199 return DM_PROBE_SCORE_FALSE;
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	200 }
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	201
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	202
2301 d71185584d95 Comment the necessity of fmtProbeGigapaintHires().. Matti Hamalainen <ccr@tnsp.org> parents: 2300 diff changeset	203 // Basic probe, but return MAX score for this format
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	204 static int fmtProbeGigapaintHires(const DMGrowBuf buf, const DMC64ImageFormat fmt)
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	205 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	206 if (buf->len == fmt->size &&
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	207 dmCompareAddr16(buf, 0, fmt->addr))
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	208 return DM_PROBE_SCORE_MAX;
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	209
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	210 return DM_PROBE_SCORE_FALSE;
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	211 }
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	212
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	214 // XXX TODO: Research what these values actually mean. It would seem probable
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	215 // that these may not be static values at all, as there are 8 more that change
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	216 // before actual image data, but do not seem to be used in the image itself.
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	217 static const Uint8 fmtMicroIllustrator_MagicID_1[] =
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	218 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	219 0xff, 0x80, 0x69, 0x67, 0x14, 0x00,
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	220 };
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	221
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	222 static const Uint8 fmtMicroIllustrator_MagicID_2[] =
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	223 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	224 0xe8, 0x03, 0xe8, 0x03, 0x40, 0x1f,
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	225 };
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	226
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	227 static int fmtProbeMicroIllustrator(const DMGrowBuf buf, const DMC64ImageFormat fmt)
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	228 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	229 if (buf->len == fmt->size &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	230 DM_MEMCMP_SIZE(buf->data + 2, fmtMicroIllustrator_MagicID_1) == 0
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	231 &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	232 DM_MEMCMP_SIZE(buf->data + 9, fmtMicroIllustrator_MagicID_2) == 0
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	233 )
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	234 return DM_PROBE_SCORE_MAX;
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	235
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	236 return DM_PROBE_SCORE_FALSE;
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	237 }
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	238
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	239
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	240 static int fmtEncodeMicroIllustrator(const DMC64EncDecOp op, DMGrowBuf buf,
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	241 const DMC64Image img, const DMC64ImageCommonFormat fmt)
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	242 {
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	243 (void) op;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	244 (void) img;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	245 (void) fmt;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	246
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	247 memcpy(buf->data + 2, fmtMicroIllustrator_MagicID_1, sizeof(fmtMicroIllustrator_MagicID_1));
4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	248 memcpy(buf->data + 9, fmtMicroIllustrator_MagicID_2, sizeof(fmtMicroIllustrator_MagicID_2));
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	249
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	250 return DMERR_OK;
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	251 }
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	252
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	253
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	254 static const Uint8 fmtSupeRes_MagicID_1[] =
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	255 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	256 0x40, 0x5c, 0x2a,
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	257 };
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	258
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	259
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	260 static int fmtProbeSupeRes(const DMGrowBuf buf, const DMC64ImageFormat fmt)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	261 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	262 if (buf->len > 12 &&
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	263 DM_MEMCMP_SIZE(buf->data, fmtSupeRes_MagicID_1) == 0)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	264 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	265 if (buf->data[3] == fmt->extra)
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	266 return DM_PROBE_SCORE_MAX;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	267 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	268
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	269 return DM_PROBE_SCORE_FALSE;
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	270 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	271
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	272
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	273 typedef struct
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	274 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	275 DMGrowBuf src;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	276 Uint8 *dstBuf;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	277 size_t dstSize;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	278
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	279 Uint8 dbyte, repcount;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	280
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	281 size_t offs, end_offs;
2524 5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	282 } DMSupeResDecCtx;
5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	283
5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	284
5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	285 static int fmtSupeResGetByte(DMSupeResDecCtx ctx, Uint8 data, const int mode)
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	286 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	287 if (!dmGrowBufGetU8(&ctx->src, data))
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	288 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	289 return dmError(DMERR_INVALID_DATA,
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	290 "SupeRes: Out of input data (N=%d).\n",
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	291 mode);
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	292 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	293 else
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	294 return DMERR_OK;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	295 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	296
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	297
2524 5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	298 static int fmtDecodeSupeRes24_25(DMSupeResDecCtx *ctx, Uint8 tmp)
2522 27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	299 {
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	300 if (tmp == 0x24)
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	301 {
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	302 ctx->dbyte = 0xff;
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	303 }
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	304 else
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	305 {
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	306 if (tmp == 0x25)
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	307 {
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	308 int res;
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	309 if ((res = fmtSupeResGetByte(ctx, &tmp, 9)) != DMERR_OK)
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	310 return res;
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	311
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	312 tmp = (0x26 + tmp) & 0xff;
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	313 }
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	314
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	315 ctx->dbyte = tmp - 0x26;
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	316 }
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	317
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	318 return DMERR_OK;
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	319 }
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	320
27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	321
2524 5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	322 static int fmtDecodeSupeResByte(DMSupeResDecCtx *ctx)
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	323 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	324 Uint8 tmp;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	325 int res;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	326
2535 5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	327 do
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	328 {
2535 5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	329 if ((res = fmtSupeResGetByte(ctx, &tmp, 1)) != DMERR_OK)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	330 break;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	331
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	332 if (tmp == 0x21)
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	333 {
2535 5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	334 // ????
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	335 ctx->offs = 0xffff;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	336 break;
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	337 }
2535 5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	338 else
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	339 if (tmp == 0x20)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	340 {
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	341 if ((res = fmtSupeResGetByte(ctx, &tmp, 2)) != DMERR_OK)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	342 break;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	343
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	344 ctx->repcount = tmp - 0x26;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	345
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	346 if ((res = fmtSupeResGetByte(ctx, &tmp, 3)) != DMERR_OK \|\|
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	347 (res = fmtDecodeSupeRes24_25(ctx, tmp)) != DMERR_OK)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	348 break;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	349
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	350 for (int cnt = 0; cnt < ctx->repcount; cnt++)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	351 {
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	352 ctx->dstBuf[ctx->offs++] = ctx->dbyte;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	353 if (ctx->offs >= ctx->end_offs)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	354 break;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	355 }
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	356
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	357 if (ctx->offs >= ctx->end_offs)
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	358 {
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	359 ctx->offs--;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	360 break;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	361 }
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	362 }
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	363 else
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	364 {
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	365 res = fmtDecodeSupeRes24_25(ctx, tmp);
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	366 break;
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	367 }
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	368 } while (1);
5f76cf36e5c5 Clean up SupeRES decoder loop a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2526 diff changeset	369
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	370 return res;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	371 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	372
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	373
2524 5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	374 static int fmtDecodeSupeResSection(DMSupeResDecCtx *ctx, const size_t offs, const size_t size)
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	375 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	376 int res = DMERR_OK;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	377
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	378 ctx->offs = offs;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	379 ctx->end_offs = offs + size;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	380
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	381 do
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	382 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	383 if ((res = fmtDecodeSupeResByte(ctx)) != DMERR_OK)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	384 goto out;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	385
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	386 if (ctx->offs < ctx->end_offs)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	387 ctx->dstBuf[ctx->offs++] = ctx->dbyte;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	388
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	389 } while (ctx->offs < ctx->end_offs);
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	390
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	391 out:
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	392 return res;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	393 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	394
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	395
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	396 static int fmtDecodeSupeRes(DMC64Image img, const DMGrowBuf psrc, const DMC64ImageFormat *fmt)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	397 {
2524 5a7e2aa8fef5 Rename DMSupeResCtx to DMSupeResDecCtx. Matti Hamalainen <ccr@tnsp.org> parents: 2523 diff changeset	398 DMSupeResDecCtx ctx;
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	399 DMGrowBuf tmp;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	400 int res;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	401
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	402 memset(&ctx, 0, sizeof(ctx));
2522 27271f2afa7c Clean up the SupeRes decoder a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2521 diff changeset	403 ctx.dstSize = 0x3000;
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	404
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	405 // As we need to modify the offs, etc. but not the data,
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	406 // we will just make a shallow copy of the DMGrowBuf struct
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	407 dmGrowBufConstCopyOffs(&ctx.src, psrc, 4);
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	408
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	409 // Allocate output buffer
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	410 if ((ctx.dstBuf = dmMalloc0(ctx.dstSize)) == NULL)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	411 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	412 return dmError(DMERR_MALLOC,
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	413 "Could not allocate memory for decoding buffer.\n");
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	414 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	415
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	416 switch (fmt->extra)
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	417 {
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	418 case 0x23:
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	419 case 0x25:
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	420 if ((res = fmtDecodeSupeResSection(&ctx, 0x0000, 0x03e8)) != DMERR_OK \|\|
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	421 (res = fmtDecodeSupeResSection(&ctx, 0x0400, 0x1f40)) != DMERR_OK)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	422 goto out;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	423 break;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	424
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	425 case 0x24:
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	426 case 0x26:
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	427 if ((res = fmtDecodeSupeResByte (&ctx)) != DMERR_OK)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	428 goto out;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	429
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	430 ctx.dstBuf[0x2710] = ctx.dbyte;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	431
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	432 if ((res = fmtDecodeSupeResSection(&ctx, 0x1f40, 0x03e8)) != DMERR_OK \|\|
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	433 (res = fmtDecodeSupeResSection(&ctx, 0x2328, 0x03e8)) != DMERR_OK \|\|
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	434 (res = fmtDecodeSupeResSection(&ctx, 0x0000, 0x1f40)) != DMERR_OK)
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	435 goto out;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	436
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	437 break;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	438 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	439
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	440 res = dmC64DecodeGenericBMP(img,
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	441 dmGrowBufConstCreateFrom(&tmp, ctx.dstBuf, ctx.dstSize), fmt);
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	442
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	443 out:
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	444 dmFree(ctx.dstBuf);
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	445 return res;
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	446 }
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	447
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	448
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	449 typedef struct
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	450 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	451 DMGrowBuf *buf;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	452
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	453 int cnt1, cnt2, dbyte;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	454 } DMSupeResEncCtx;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	455
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	456
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	457 static bool fmtEncodeSupeResRun(DMSupeResEncCtx *ctx)
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	458 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	459 if (ctx->cnt2 == 255)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	460 ctx->cnt2 = 0x24;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	461 else
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	462 if (ctx->cnt2 > 216)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	463 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	464 if (!dmGrowBufPutU8(ctx->buf, 0x25))
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	465 return false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	466 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	467 else
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	468 ctx->cnt2 += 0x26;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	469
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	470 if (!dmGrowBufPutU8(ctx->buf, ctx->cnt2))
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	471 return false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	472
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	473 ctx->cnt1 = ctx->cnt2 = 0;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	474
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	475 return true;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	476 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	477
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	478
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	479 static bool fmtEncodeSupeResFlush(DMSupeResEncCtx *ctx)
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	480 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	481 ctx->cnt1 += 0x26;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	482
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	483 if (!dmGrowBufPutU8(ctx->buf, 0x20) \|\|
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	484 !dmGrowBufPutU8(ctx->buf, ctx->cnt1))
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	485 return false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	486
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	487 return fmtEncodeSupeResRun(ctx);
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	488 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	489
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	490
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	491 static bool fmtEncodeSupeResSection(DMSupeResEncCtx ctx, const DMC64MemBlock blk)
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	492 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	493 for (size_t offs = 0; offs < blk->size; offs++)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	494 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	495 ctx->dbyte = blk->data[offs];
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	496
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	497 if ((ctx->cnt1 == 0 && offs + 1 < blk->size && ctx->dbyte == blk->data[offs + 1]) \|\|
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	498 (ctx->cnt1 != 0 && ctx->dbyte == ctx->cnt2))
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	499 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	500 ctx->cnt1++;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	501 ctx->cnt2 = ctx->dbyte;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	502
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	503 if (ctx->cnt1 >= 215 &&
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	504 !fmtEncodeSupeResFlush(ctx))
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	505 return false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	506
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	507 continue;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	508 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	509 else
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	510 if (ctx->cnt1 != 0 && ctx->dbyte != ctx->cnt2)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	511 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	512 if (!fmtEncodeSupeResFlush(ctx))
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	513 return false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	514 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	515
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	516 ctx->cnt2 = ctx->dbyte;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	517
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	518 if (!fmtEncodeSupeResRun(ctx))
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	519 return false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	520 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	521
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	522 if (ctx->cnt1 > 0)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	523 return fmtEncodeSupeResFlush(ctx);
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	524
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	525 return true;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	526 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	527
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	528
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	529 static int fmtEncodeSupeRes(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	530 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	531 DMSupeResEncCtx ctx;
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	532 bool bres = false;
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	533
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	534 // Output magic header and data type
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	535 if (!dmGrowBufPut(buf, fmtSupeRes_MagicID_1, sizeof(fmtSupeRes_MagicID_1)) \|\|
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	536 !dmGrowBufPutU8(buf, fmt->extra))
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	537 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	538 return dmError(DMERR_MALLOC,
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	539 "Error outputting SupeRes magic header.\n");
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	540 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	541
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	542 memset(&ctx, 0, sizeof(ctx));
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	543 ctx.buf = buf;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	544
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	545 switch (fmt->extra)
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	546 {
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	547 case 0x23:
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	548 case 0x25:
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	549 bres =
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	550 fmtEncodeSupeResSection(&ctx, &img->screen[0]) &&
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	551 fmtEncodeSupeResSection(&ctx, &img->bitmap[0]);
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	552 break;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	553
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	554 case 0x24:
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	555 case 0x26:
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	556 ctx.cnt2 = img->bgcolor;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	557 bres =
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	558 fmtEncodeSupeResRun(&ctx) &&
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	559 fmtEncodeSupeResSection(&ctx, &img->screen[0]) &&
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	560 fmtEncodeSupeResSection(&ctx, &img->color[0]) &&
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	561 fmtEncodeSupeResSection(&ctx, &img->bitmap[0]);
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	562 break;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	563 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	564
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	565 return bres ? DMERR_OK : DMERR_MALLOC;
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	566 }
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	567
19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	568
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	569 static const Uint8 fmtMarqPETSCII_ID1[] =
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	570 {
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	571 0x01, 0x08, 0x0b, 0x08, 0xef, 0x00, 0x9e, 0x32, 0x30, 0x36,
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	572 0x31, 0x00, 0x00, 0x00, 0xa9, 0x0b, 0x8d, 0x11, 0xd0,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	573 };
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	574
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	575 static const Uint8 fmtMarqPETSCII_ID2[] =
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	576 {
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	577 0xa9, 0x00, 0x8d, 0x18, 0xd0, // lda #? : sta $d018
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	578 0xa9, 0x00, 0x8d, 0x20, 0xd0, // lda #? : sta $d020
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	579 0xa9, 0x00, 0x8d, 0x21, 0xd0, // lda #? : sta $d021
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	580 };
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	581
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	582 static const Uint8 fmtMarqPETSCII_ID3[] =
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	583 {
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	584 0xa2, 0x00, 0xa0, 0xfa, 0xbd, 0x61,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	585 0x08, 0x9d, 0x00, 0x04, 0xbd, 0x5b, 0x09, 0x9d, 0xfa, 0x04,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	586 0xbd, 0x55, 0x0a, 0x9d, 0xf4, 0x05, 0xbd, 0x4f, 0x0b, 0x9d,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	587 0xee, 0x06, 0xbd, 0x49, 0x0c, 0x9d, 0x00, 0xd8, 0xbd, 0x43,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	588 0x0d, 0x9d, 0xfa, 0xd8, 0xbd, 0x3d, 0x0e, 0x9d, 0xf4, 0xd9,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	589 0xbd, 0x37, 0x0f, 0x9d, 0xee, 0xda, 0xe8, 0x88, 0xd0, 0xcc,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	590 0xa9, 0x1b, 0x8d, 0x11, 0xd0, 0x4c, 0x5e, 0x08,
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	591 };
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	592
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	593
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	594 static int fmtProbeMarqPETSCII(const DMGrowBuf buf, const DMC64ImageFormat fmt)
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	595 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	596 (void) fmt;
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	597
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	598 if (buf->len == 2098 &&
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	599 DM_MEMCMP_SIZE(buf->data, fmtMarqPETSCII_ID1) == 0 &&
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	600 DM_MEMCMP_SIZE(buf->data + sizeof(fmtMarqPETSCII_ID1) +
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	601 sizeof(fmtMarqPETSCII_ID2), fmtMarqPETSCII_ID3) == 0
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	602 )
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	603 return DM_PROBE_SCORE_MAX;
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	604
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	605 return DM_PROBE_SCORE_FALSE;
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	606 }
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	607
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	608
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	609 static int fmtDecodeHiresPETSCIICharsetData(const DMC64EncDecOp op, DMC64Image img,
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	610 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	611 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	612 (void) fmt;
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	613 Uint8 val;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	614
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	615 switch (buf->data[op->offs])
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	616 {
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	617 case 0x14: val = 0; break; // upper case
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	618 case 0x17: val = 1; break; // lower case
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	619 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	620 return DMERR_INVALID_DATA;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	621 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	622
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	623 img->extraInfo[D64_EI_CHAR_CASE] = val;
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	624 img->extraInfo[D64_EI_MODE] = D64_FMT_HIRES \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	625 img->extraInfo[D64_EI_CHAR_CUSTOM] = 0;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	626
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	627 return DMERR_OK;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	628 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	629
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	630
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	631 static int fmtEncodeHiresPETSCIICharsetData(
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	632 const DMC64EncDecOp op, DMGrowBuf buf, const DMC64Image *img,
09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	633 const DMC64ImageCommonFormat *fmt)
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	634 {
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	635 Uint8 val;
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	636 (void) fmt;
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	637
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	638 switch (img->extraInfo[D64_EI_CHAR_CASE])
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	639 {
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	640 case 0: val = 0x14; break;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	641 case 1: val = 0x17; break;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	642 default: return DMERR_INVALID_DATA;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	643 }
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	644
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	645 buf->data[op->offs + 2] = val;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	646
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	647 return DMERR_OK;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	648 }
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	649
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	650
2366 1e6e018b6487 Rename some functions to be more consistent with their intent. Matti Hamalainen <ccr@tnsp.org> parents: 2363 diff changeset	651 static int fmtEncodeMarqPETSCIIData(const DMC64EncDecOp op, DMGrowBuf buf,
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	652 const DMC64Image img, const DMC64ImageCommonFormat fmt)
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	653 {
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	654 memcpy(buf->data,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	655 fmtMarqPETSCII_ID1, sizeof(fmtMarqPETSCII_ID1));
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	656
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	657 memcpy(buf->data + sizeof(fmtMarqPETSCII_ID1),
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	658 fmtMarqPETSCII_ID2, sizeof(fmtMarqPETSCII_ID2));
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	659
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	660 memcpy(buf->data + sizeof(fmtMarqPETSCII_ID1) + sizeof(fmtMarqPETSCII_ID2),
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	661 fmtMarqPETSCII_ID3, sizeof(fmtMarqPETSCII_ID3));
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	662
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	663 return fmtEncodeHiresPETSCIICharsetData(op, buf, img, fmt);
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	664 }
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	665
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	666
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	667 static const Uint8 fmtPetsciiKrisszHu_ID1[] =
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	668 {
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	669 0x01, 0x08, 0x0b, 0x08, 0x0A, 0x00, 0x9E, 0x32, 0x30, 0x36,
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	670 0x31, 0x00, 0x00, 0x00, 0xA9,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	671 };
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	672
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	673 static const Uint8 fmtPetsciiKrisszHu_ID2[] =
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	674 {
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	675 0x8d, 0x11, 0xd0, 0xa9, 0x80, 0x8d, 0x91, 0x02, 0xa9, 0x18,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	676 };
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	677
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	678
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	679 static int fmtProbePetsciiKrisszHu(const DMGrowBuf buf, const DMC64ImageFormat fmt)
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	680 {
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	681 (void) fmt;
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	682
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	683 if (buf->len == 10193 &&
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	684 DM_MEMCMP_SIZE(buf->data, fmtPetsciiKrisszHu_ID1) == 0 &&
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	685 DM_MEMCMP_SIZE(buf->data + 0x10, fmtPetsciiKrisszHu_ID2) == 0
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	686 )
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	687 return DM_PROBE_SCORE_MAX;
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	688
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	689 return DM_PROBE_SCORE_FALSE;
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	690 }
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	691
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	692
2366 1e6e018b6487 Rename some functions to be more consistent with their intent. Matti Hamalainen <ccr@tnsp.org> parents: 2363 diff changeset	693 static int fmtDecodePetsciiKrisszHuData(const DMC64EncDecOp op, DMC64Image img,
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	694 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	695 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	696 (void) op;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	697 (void) buf;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	698 (void) fmt;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	699
2596 353192a5100a Add tiny comment about issues with ECM support. Matti Hamalainen <ccr@tnsp.org> parents: 2595 diff changeset	700 // XXX TODO: ECM support is buggy, see
353192a5100a Add tiny comment about issues with ECM support. Matti Hamalainen <ccr@tnsp.org> parents: 2595 diff changeset	701 // samples/64/petscii/them_balls_dont_touch_by_aomeba_ald.prg
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	702 const Uint8 *data = img->extraData[0].data;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	703 switch (data[0x0028 - 2])
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	704 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	705 case 0x00:
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	706 img->extraInfo[D64_EI_MODE] = D64_FMT_HIRES \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	707 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	708 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	709 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	710
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	711 case 0xd8:
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	712 img->extraInfo[D64_EI_MODE] = D64_FMT_MC \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	713 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	714 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	715 img->d022 = data[0x002d - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	716 img->d023 = data[0x0032 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	717 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	718
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	719 case 0x01:
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	720 img->extraInfo[D64_EI_MODE] = D64_FMT_ECM \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	721 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	722 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	723 img->d022 = data[0x0028 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	724 img->d023 = data[0x002d - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	725 img->d024 = data[0x0032 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	726 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	727
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	728 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	729 return DMERR_INVALID_DATA;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	730 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	731
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	732 // XXX TODO this format saves the charset data (for 256 chars)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	733 // in the PRG and there is no direct indication whether it is
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	734 // a customized one or copy of C64 ROM charset .. we could
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	735 // implement a hash-based detection at some point.
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	736 img->extraInfo[D64_EI_CHAR_CASE] = 0;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	737 img->extraInfo[D64_EI_CHAR_CUSTOM] = 1;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	738
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	739 return DMERR_OK;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	740 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	741
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	742
2377 d8889ff223b6 UPETSCII is actually old version of Marq's PETSCII editor. Matti Hamalainen <ccr@tnsp.org> parents: 2371 diff changeset	743 static int fmtDecodeMarqOldData(const DMC64EncDecOp op, DMC64Image img,
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	744 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	745 {
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	746 (void) op;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	747 (void) buf;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	748 (void) fmt;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	749
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	750 img->extraInfo[D64_EI_MODE] = D64_FMT_HIRES \| D64_FMT_CHAR;
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	751 img->extraInfo[D64_EI_CHAR_CUSTOM] = 0;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	752
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	753 return DMERR_OK;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	754 }
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	755
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	756
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	757 static const Uint8 fmtCocaPETSCII_ID1[] =
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	758 {
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	759 0x01, 0x08, 0x0b, 0x08, 0x0a, 0x00, 0x9e, 0x32, 0x30, 0x36,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	760 0x31, 0x00, 0x00, 0x00, 0x78, 0xa2, 0x00, 0xbd, 0x5a, 0x08,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	761 0x9d, 0x00, 0x04, 0xbd, 0x5a, 0x09, 0x9d, 0x00, 0x05, 0xbd,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	762 0x5a, 0x0a, 0x9d, 0x00, 0x06, 0xbd, 0x5a, 0x0b, 0x9d, 0x00,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	763 0x07, 0xbd, 0x5a, 0x0c, 0x9d, 0x00, 0xd8, 0xbd, 0x5a, 0x0d,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	764 0x9d, 0x00, 0xd9, 0xbd, 0x5a, 0x0e, 0x9d, 0x00, 0xda, 0xbd,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	765 0x5a, 0x0f, 0x9d, 0x00, 0xdb, 0xe8, 0xd0, 0xcd, 0xad, 0x42,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	766 0x0c, 0x8d, 0x20, 0xd0, 0xad, 0x43, 0x0c, 0x8d, 0x21, 0xd0,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	767 0xad, 0x44, 0x0c, 0x8d, 0x18, 0xd0, 0x4c, 0x55, 0x08
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	768 };
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	769
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	770
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	771 static int fmtProbeCocaPETSCII(const DMGrowBuf buf, const DMC64ImageFormat fmt)
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	772 {
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	773 (void) fmt;
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	774
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	775 if (buf->len == 2115 &&
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	776 DM_MEMCMP_SIZE(buf->data, fmtCocaPETSCII_ID1) == 0 &&
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	777 buf->data[0x0c44 - 0x0801 + 2] == 0x14)
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	778 return DM_PROBE_SCORE_MAX;
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	779
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	780 return DM_PROBE_SCORE_FALSE;
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	781 }
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	782
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	783
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	784 static int fmtEncodeCocaPETSCIIData(const DMC64EncDecOp op, DMGrowBuf buf,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	785 const DMC64Image img, const DMC64ImageCommonFormat fmt)
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	786 {
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	787 memcpy(buf->data,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	788 fmtCocaPETSCII_ID1, sizeof(fmtCocaPETSCII_ID1));
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	789
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	790 return fmtEncodeHiresPETSCIICharsetData(op, buf, img, fmt);
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	791 }
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	792
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	793
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	794 static int fmtProbeKoalaPainter(const DMGrowBuf buf, const DMC64ImageFormat fmt)
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	795 {
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	796 int score = DM_PROBE_SCORE_FALSE;
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	797
2591 b2c510f851dc Adjust Koala format probing to allow for file lengths between 10002 and Matti Hamalainen <ccr@tnsp.org> parents: 2586 diff changeset	798 if (buf->len >= 10002 &&
b2c510f851dc Adjust Koala format probing to allow for file lengths between 10002 and Matti Hamalainen <ccr@tnsp.org> parents: 2586 diff changeset	799 buf->len <= 10004)
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	800 score += DM_PROBE_SCORE_MAYBE;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	801
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	802 if (dmCompareAddr16(buf, 0, fmt->addr))
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	803 score += DM_PROBE_SCORE_MAYBE;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	804
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	805 return score;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	806 }
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	807
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	808
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	809 static int fmtProbeKoalaPainterPacked(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	810 {
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	811 // Attempt to prevent misprobes of unpacked Koala and Run Paint
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	812 if (buf->len > 30 &&
2112 9dc2976e9fa3 Improve probing of packed and unpacked Koala files. Many converters and Matti Hamalainen <ccr@tnsp.org> parents: 2080 diff changeset	813 buf->len < 10002 &&
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	814 dmCompareAddr16(buf, 0, fmt->addr))
1771 c261db6e39aa Adjust some probe scores. Matti Hamalainen <ccr@tnsp.org> parents: 1770 diff changeset	815 return DM_PROBE_SCORE_GOOD;
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	816
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	817 return DM_PROBE_SCORE_FALSE;
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	818 }
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	819
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	820
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	821 static int fmtProbeDoodle(const DMGrowBuf buf, const DMC64ImageFormat fmt)
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	822 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	823 if (buf->len > 32 &&
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	824 (dmCompareAddr16(buf, 0, 0x1c00) \|\| dmCompareAddr16(buf, 0, 0x5c00)))
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	825 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	826 // Packed variant
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	827 if (fmt->extra == 0xfe &&
1841 fc4841460fad Attempt to avoid misprobes of "Rainbow Painter (unpacked)" as packed Doodle files. Matti Hamalainen <ccr@tnsp.org> parents: 1840 diff changeset	828 buf->len != 10242) // Attempt to avoid misprobes of "Rainbow Painter (unpacked)"
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	829 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	830
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	831 // Unpacked variant
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	832 if (fmt->extra != 0xfe && buf->len == fmt->size)
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	833 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	834 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	835
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	836 return DM_PROBE_SCORE_FALSE;
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	837 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	838
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	839
2161 6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	840 static int fmtProbeArtStudio(const DMGrowBuf buf, const DMC64ImageFormat fmt)
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	841 {
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	842 if ((buf->len == fmt->size \|\| buf->len == 9002) &&
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	843 dmCompareAddr16(buf, 0, 0x2000))
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	844 return DM_PROBE_SCORE_MAX;
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	845
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	846 return DM_PROBE_SCORE_FALSE;
2161 6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	847 }
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	848
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	849
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	850 static int fmtDecodeStaticRLEMarkerMode2(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	851 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	852 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	853 DMGrowBuf mem;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	854 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	855
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	856 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	857 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	858 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_2;
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	859 cfg.rleMarkerB = fmt->extra;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	860
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	861 if ((res = dmDecodeGenericRLEAlloc(&mem, buf, &cfg)) != DMERR_OK)
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	862 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	863
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	864 res = dmC64DecodeGenericBMP(img, &mem, fmt);
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	865
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	866 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	867 dmGrowBufFree(&mem);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	868 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	869 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	870
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	871
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	872 static int fmtEncodeStaticRLEMarkerMode2(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	873 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	874 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	875 DMGrowBuf tmp;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	876 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	877
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	878 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	879 if ((res = dmC64EncodeGenericBMP(true, &tmp, img, fmt)) != DMERR_OK)
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	880 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	881
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	882 // And now RLE compress the data to the existing buffer
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	883 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	884 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	885 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_2;
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	886 cfg.rleMarkerB = fmt->extra;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	887 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	888 cfg.rleMaxCountB = 255;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	889 res = dmEncodeGenericRLE(buf, &tmp, &cfg);
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	890
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	891 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	892 dmGrowBufFree(&tmp);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	893 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	894 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	895
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	896
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	897 static int fmtProbeDrazPaint20Packed(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	898 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	899 const Uint8 *ident = buf->data + 2;
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	900 if (buf->len > 22 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	902 DM_MEMCMP_LEN(ident, "DRAZPAINT ") == 0 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 ident[11] == '.' && (
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904 (ident[10] == '1' && ident[12] == '4') \|\|
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	905 (ident[10] == '2' && ident[12] == '0')
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	906 ))
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	907 return DM_PROBE_SCORE_MAX;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	908
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	909 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	913 static int fmtDecodeDrazPaintPacked(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	914 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	916 DMGrowBuf mem, tmp;
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	917 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	918
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	919 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	920 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	921 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	922 cfg.rleMarkerB = buf->data[0x0d];
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	923
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	924 if ((res = dmDecodeGenericRLEAlloc(&mem,
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	925 dmGrowBufConstCopyOffs(&tmp, buf, 0x0e), &cfg)) != DMERR_OK)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	926 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	928 res = dmC64DecodeGenericBMP(img, &mem, fmt);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	933 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936 static int fmtEncodeDrazPaintPacked(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	938 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 DMGrowBuf tmp;
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	940 DMCompParams cfg;
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	941 const char *magicID = (fmt->format->mode & D64_FMT_ILACE) ? "DRAZLACE! 1.0" : "DRAZPAINT 2.0";
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	943 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	944 if ((res = dmC64EncodeGenericBMP(true, &tmp, img, fmt)) != DMERR_OK)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	945 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	946
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1649 diff changeset	947 // Analyze and setup RLE
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	948 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	949 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	950 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	951 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	952 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	954 if ((res = dmGenericRLEAnalyze(&tmp, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	955 goto out;
1661 dc3fbd130db7 RLE analyze was ran before setting up the compression config. Oops. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	956
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	957 // Add the header bits
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1684 diff changeset	958 if (!dmGrowBufPut(buf, (Uint8 *) magicID, strlen(magicID)) \|\|
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	959 !dmGrowBufPutU8(buf, cfg.rleMarkerB))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	962 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	963 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	964
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	965 // And now RLE compress the data to the existing buffer
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	966 res = dmEncodeGenericRLE(buf, &tmp, &cfg);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	967
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	968 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	970 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	973
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	974 static int fmtProbeDrazLace10Packed(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	976 if (buf->len > 22 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	978 DM_MEMCMP_LEN(buf->data + 2, "DRAZLACE! 1.0") == 0)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 return DM_PROBE_SCORE_MAX;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	981 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	983
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	984
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	985 static int fmtDrazLaceGetLaceType(const DMC64EncDecOp op, DMC64Image img,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	986 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988 (void) fmt;
1930 c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	989
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	990 img->extraInfo[D64_EI_ILACE_TYPE] = buf->data[op->offs] ? D64_ILACE_RES : D64_ILACE_COLOR;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	991 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	995 static int fmtDrazLaceSetLaceType(const DMC64EncDecOp op, DMGrowBuf buf,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	996 const DMC64Image img, const DMC64ImageCommonFormat fmt)
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	997 {
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	998 (void) fmt;
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	999 buf->data[op->offs] = (img->extraInfo[D64_EI_ILACE_TYPE] == D64_ILACE_RES) ? 1 : 0;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1000 return DMERR_OK;
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	1001 }
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	1002
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	1003
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1004 static int fmtGetPixelDrazLace(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1005 const DMC64Image *img, const int rasterX, const int rasterY)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1006 {
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	1007 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	1008 (void) vshift;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1009
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1010 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1011 bmoffs, scroffs,
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	1012 6 - (rasterX & 6), 0,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1013 rasterX & 1, 0, img->bgcolor);
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1014 }
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1015
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1016
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1017 static const char *fmtBDP5_MagicID = "BDP 5.00";
1662 34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	1018
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1019 static int fmtProbeBDP5Packed(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1020 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1021 if (buf->len > 20 &&
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1022 dmCompareAddr16(buf, 0, fmt->addr) &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1023 DM_MEMCMP_LEN(buf->data + 2, fmtBDP5_MagicID) == 0)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1024 return DM_PROBE_SCORE_MAX;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1025
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1026 return DM_PROBE_SCORE_FALSE;
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1027 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1028
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1029
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1030 static int fmtDecodeBDP5Packed(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1031 {
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1032 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1033 DMGrowBuf mem, tmp;
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1034 DMCompParams cfg;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1035
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1036 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1037 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1038 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_WORD_RUNS \| DM_COMP_RLE_ORDER_1;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1039 cfg.rleMarkerB = buf->data[8];
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1040 cfg.rleMarkerW = buf->data[9];
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1041
1791 ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1042 // Boogie Down Paint apparently is broken and stores one byte less
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1043 // than it should in some cases so we need to do some crappy buffer
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1044 // expansion here ..
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1045 if (dmGrowBufCopyOffs(&tmp, buf, 10, 1) == NULL)
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1046 return DMERR_MALLOC;
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1047
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1048 tmp.len = tmp.size;
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1049
ae53df2156ed Add buffer expansion quirk to Boogie Down Paint decoder, as it seems to be needed. Matti Hamalainen <ccr@tnsp.org> parents: 1789 diff changeset	1050 if ((res = dmDecodeGenericRLEAlloc(&mem, &tmp, &cfg)) != DMERR_OK)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1051 goto out;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1052
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1053 res = dmC64DecodeGenericBMP(img, &mem, fmt);
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1054
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1055 out:
1792 905c09049fe6 Oops, forgot to free the buffer allocated in the BDP5 decoder. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1791 diff changeset	1056 dmGrowBufFree(&tmp);
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1057 dmGrowBufFree(&mem);
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1058 return res;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1059 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1060
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	1061
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1062 static int fmtEncodeBDP5Packed(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1063 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1064 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1065 DMGrowBuf mem;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1066 DMCompParams cfg;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1067
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1068 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1069 if ((res = dmC64EncodeGenericBMP(true, &mem, img, fmt)) != DMERR_OK)
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1070 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1071
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1072 // Analyze and setup RLE
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1073 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1074 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1075 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_WORD_RUNS \| DM_COMP_RLE_ORDER_1;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	1076 cfg.rleMinCountB = 4;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1077 cfg.rleMaxCountB = 255;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1078 cfg.rleMinCountW = 256;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1079 cfg.rleMaxCountW = 1024;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1080
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1081 if ((res = dmGenericRLEAnalyze(&mem, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1082 goto out;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1083
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1084 // Add the header bits
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1085 if (!dmGrowBufPut(buf, (Uint8 *) fmtBDP5_MagicID, strlen(fmtBDP5_MagicID)) \|\|
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1086 !dmGrowBufPutU8(buf, cfg.rleMarkerB) \|\|
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1087 !dmGrowBufPutU8(buf, cfg.rleMarkerW))
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1088 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1089 res = DMERR_MALLOC;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1090 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1091 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1092
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1093 // And now RLE compress the data to the existing buffer
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1094 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1095
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1096 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1097 dmGrowBufFree(&mem);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1098 return res;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1099 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1100
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	1101
2185 6ba6ca5632d2 Make GunPaint v1.1 writing more accurate. Matti Hamalainen <ccr@tnsp.org> parents: 2178 diff changeset	1102 static const char *fmtGunPaint_MagicID = "GUNPAINT (JZ) ";
6ba6ca5632d2 Make GunPaint v1.1 writing more accurate. Matti Hamalainen <ccr@tnsp.org> parents: 2178 diff changeset	1103 #define fmtGunPaint_MagicLen (16)
6ba6ca5632d2 Make GunPaint v1.1 writing more accurate. Matti Hamalainen <ccr@tnsp.org> parents: 2178 diff changeset	1104 #define fmtGunPaint_MagicOffs (0x03e8)
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1105
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1106 static int fmtProbeGunPaint(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1107 {
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1108 if (buf->len > fmtGunPaint_MagicOffs + fmtGunPaint_MagicLen &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1109 dmCompareAddr16(buf, 0, fmt->addr) &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1110 memcmp(buf->data + fmtGunPaint_MagicOffs + 2, fmtGunPaint_MagicID, fmtGunPaint_MagicLen) == 0)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1111 return DM_PROBE_SCORE_MAX;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1112
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1113 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1114 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1115
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1116
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1117 static int fmtEncodeGunPaint(const DMC64EncDecOp op, DMGrowBuf buf,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	1118 const DMC64Image img, const DMC64ImageCommonFormat fmt)
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1119 {
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1120 (void) op;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1121 (void) img;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1122 (void) fmt;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1123
1946 c30dfd5e3227 Add a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1941 diff changeset	1124 // Here we assume that the op triggering this function is
c30dfd5e3227 Add a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1941 diff changeset	1125 // at the end of the oplist, so the memory is allocated,
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1126 memcpy(buf->data + fmtGunPaint_MagicOffs + 2, fmtGunPaint_MagicID, fmtGunPaint_MagicLen);
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1127
27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1128 return DMERR_OK;
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1129 }
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1130
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1131
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1132 static int fmtProbeAmicaPaintPacked(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1133 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1134 size_t i, n;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1135
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1136 if (buf->len < 256 \|\| !dmCompareAddr16(buf, 0, fmt->addr))
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1137 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1138
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1139 // Interpaint Hi-Res gives a false positive
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1140 // as do some GunPaint images ..
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1141 if (buf->len == 9002 \|\|
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1142 fmtProbeGunPaint(buf, fmt) > DM_PROBE_SCORE_GOOD)
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1143 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1144
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1145 for (n = 0, i = 2; i < buf->len; i++)
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1146 if (buf->data[i] == 0xC2) n++;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1147
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1148 if (n > 50)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1149 return DM_PROBE_SCORE_GOOD;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1150 if (n > 25)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1151 return DM_PROBE_SCORE_AVG;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1152 if (n > 10)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1153 return DM_PROBE_SCORE_MAYBE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1154
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1155 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1156 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1157
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1158
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1159 static int fmtDecodeAmicaPaintPacked(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1162 DMGrowBuf mem, tmp;
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	1163 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1164
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1165 // Amica Paint apparently is broken and stores one byte less than it should
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1166 // so we need to do some crappy buffer expansion here ..
1751 768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	1167 if (dmGrowBufCopy(&tmp, buf, 1) == NULL)
768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	1168 return DMERR_MALLOC;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1169
1751 768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	1170 tmp.len = tmp.size;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1171
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1172 // Now do an RLE decode on the enlarged buffer
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1173 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1174 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1175 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1176 cfg.rleMarkerB = 0xC2;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1649 diff changeset	1177
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1178 if ((res = dmDecodeGenericRLEAlloc(&mem, &tmp, &cfg)) != DMERR_OK)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1179 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1180
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1181 // And finally decode to bitmap struct
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1182 res = dmC64DecodeGenericBMP(img, &mem, fmt);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1183
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1184 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1185 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1186 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1187 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1188 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1189
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1190
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1191 static int fmtEncodeAmicaPaintPacked(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1192 {
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1193 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1194 DMGrowBuf mem;
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1195 DMCompParams cfg;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1196
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1197 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1198 if ((res = dmC64EncodeGenericBMP(true, &mem, img, fmt)) != DMERR_OK)
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1199 goto out;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1200
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1201 // And now RLE compress the data to the existing buffer
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1202 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1203 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1204 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1205 cfg.rleMarkerB = 0xC2;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	1206 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1207 cfg.rleMaxCountB = 255;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1649 diff changeset	1208
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1209 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1210
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1211 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1212 dmGrowBufFree(&mem);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1213 return res;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1214 }
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1215
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1216
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1217 static int fmtProbeSaracenPaint(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1772 5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1218 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1219 if ((buf->len == 10219 \|\| buf->len == 10220) &&
1772 5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1220 dmCompareAddr16(buf, 0, fmt->addr))
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1221 return DM_PROBE_SCORE_GOOD;
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1222
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1223 return DM_PROBE_SCORE_FALSE;
1772 5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1224 }
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1225
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	1226
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1227 static int fmtGetPixelFLIDesigner(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1228 const DMC64Image *img, const int rasterX, const int rasterY)
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	1229 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1230 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1231
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1232 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1233 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1234 vshift, rasterY & 7,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1235 0, 0, img->bgcolor);
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	1236 }
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	1237
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	1238
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1239 static int fmtProbeBlackMailFLIPacked(const DMGrowBuf buf, const DMC64ImageFormat fmt)
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1240 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1241 if (buf->len > 16 &&
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1242 dmCompareAddr16(buf, 0, fmt->addr) &&
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1243 dmCompareAddr16(buf, 2 + 1, fmt->addr + buf->len - 3) &&
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1244 dmCompareAddr16(buf, 2 + 3, 0x7f3f))
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1245 return DM_PROBE_SCORE_MAX;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1246
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1247 return DM_PROBE_SCORE_FALSE;
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1248 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1249
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1250
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1251 static int fmtDecodeBlackMailFLIPacked(DMC64Image img, const DMGrowBuf psrc, const DMC64ImageFormat *fmt)
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1252 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1253 int res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1254 DMGrowBuf dst, src;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1255 DMCompParams cfg;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1256
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1257 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1258 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1259 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1 \| DM_COMP_RLE_ZERO_COUNT_MAX \|
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1260 DM_COMP_INPUT_BACKWARDS \| DM_COMP_OUTPUT_BACKWARDS \| DM_COMP_OUTPUT_CROP_END;
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1261 cfg.rleMarkerB = psrc->data[0];
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1262 cfg.cropOutLen = 0x4442 - 2; // Crop to unpacked size - load address
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1263
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1264 // Skip the RLE marker byte, packed data end address and unpacked data end address
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1265 dmGrowBufConstCopyOffs(&src, psrc, 1 + 2 + 2);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1266
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1267 if ((res = dmDecodeGenericRLEAlloc(&dst, &src, &cfg)) != DMERR_OK)
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1268 goto out;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1269
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1270 res = dmC64DecodeGenericBMP(img, &dst, fmt);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1271
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1272 out:
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1273 dmGrowBufFree(&dst);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1274 return res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1275 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1276
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1277
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1278 static int fmtEncodeBlackMailFLIPacked(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1279 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1280 int res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1281 DMGrowBuf tmp1, tmp2;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1282 DMCompParams cfg;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1283
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1284 dmGrowBufInit(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1285 dmGrowBufInit(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1286
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1287 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1288 if ((res = dmC64EncodeGenericBMP(true, &tmp1, img, fmt)) != DMERR_OK)
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1289 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1290
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1291 // And now RLE compress the data to the existing buffer
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1292 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1293 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1294 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1 \| DM_COMP_RLE_ZERO_COUNT_MAX \|
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1295 DM_COMP_INPUT_BACKWARDS \| DM_COMP_OUTPUT_BACKWARDS;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	1296 cfg.rleMinCountB = 4;
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1297 cfg.rleMaxCountB = 256; // this format allows 256 byte runs with ZERO_COUNT_MAX
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1298
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1299 if ((res = dmGenericRLEAnalyze(&tmp1, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1300 goto out;
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1301
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1302 if ((res = dmEncodeGenericRLEAlloc(&tmp2, &tmp1, &cfg)) != DMERR_OK)
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1303 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1304
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1305 // Now, finally we must put in the header etc.
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1306 if (!dmGrowBufPutU8(buf, cfg.rleMarkerB) \|\|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1307 !dmGrowBufPutU16LE(buf, fmt->addr + tmp2.len + 4) \|\|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1308 !dmGrowBufPutU16LE(buf, 0x7f3f) \|\|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1309 !dmGrowBufPut(buf, tmp2.data, tmp2.len))
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1310 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1311 res = DMERR_MALLOC;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1312 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1313 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1314
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1315 out:
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1316 dmGrowBufFree(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1317 dmGrowBufFree(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1318 return res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1319 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1320
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1321
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1322 static int fmtGetPixelBlackMailFLI(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1323 const DMC64Image *img, const int rasterX, const int rasterY)
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1324 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1325 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1326
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1327 Uint8 bgcol = (unsigned) rasterY < img->extraData[0].size ?
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1328 img->extraData[0].data[rasterY] : img->bgcolor;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1329
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1330 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1331 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1332 vshift, rasterY & 7,
2222 75b5bb490f38 Add & 15 to deeper helper functions and remove it from unnecessary places. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	1333 0, 0, bgcol);
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1334 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1335
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1336
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1337 static int fmtGetPixelTruePaint(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1338 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339 {
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	1340 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	1341 (void) vshift;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1342
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1343 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1344 bmoffs, scroffs,
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	1345 6 - (rasterX & 6), 0,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1346 rasterX & 1, 0, img->bgcolor);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1347 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1348
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1349
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1350 static int fmtProbeTruePaintPacked(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1351 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1352 // The beginning/un-changing part of the BASIC bootstrap and
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1353 // relocation of decompression code
1684 e7990551c6d6 Rename function variable. Matti Hamalainen <ccr@tnsp.org> parents: 1671 diff changeset	1354 static const Uint8 magicID[] = {
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1355 0x0b, 0x08, 0x09, 0x00, 0x9e, 0x32, 0x30, 0x35,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1356 0x39, 0x00, 0xa2, 0x00, 0x78, 0xbd, 0x1c, 0x08,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1357 0x9d, 0xf5, 0x00, 0xe8, 0xd0, 0xf7, 0xe6, 0x01,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1358 0x4c, 0x01, 0x01, 0xa5, 0xfe, 0xd0, 0x02, 0xc6,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1359 0xff, 0xc6, 0xfe
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1360 };
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1361
1789 9f5c5ab0e85e Adjust True Paint probing to be slightly more forgiving vs. file size. Matti Hamalainen <ccr@tnsp.org> parents: 1788 diff changeset	1362 if (buf->len >= 320 &&
9f5c5ab0e85e Adjust True Paint probing to be slightly more forgiving vs. file size. Matti Hamalainen <ccr@tnsp.org> parents: 1788 diff changeset	1363 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	1364 DM_MEMCMP_SIZE(buf->data + 2, magicID) == 0)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1365 return DM_PROBE_SCORE_MAX;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1366
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1367 return DM_PROBE_SCORE_FALSE;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1368 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1369
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1370
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1371 //
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1372 // Based on disassembly of the depacker routine. Encoding seems to be
1714 95317672ff00 Improve a comment on TruePaint encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1712 diff changeset	1373 // some kind of "improved RLE" variant with different modes and a
95317672ff00 Improve a comment on TruePaint encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1712 diff changeset	1374 // simplistic "codebook".
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1375 //
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1376 static int fmtTruePaintGetByte(DMGrowBuf src, Uint8 data, const int mode)
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1377 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1378 if (!dmGrowBufGetU8(src, data))
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1379 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1380 return dmError(DMERR_INVALID_DATA,
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1381 "TruePaintRLE: Out of input data (N=%d)\n", mode);
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1382 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1383 else
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1384 return DMERR_OK;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1385 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1386
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1387
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1388 static int fmtDecodeTruePaintPacked(DMC64Image img, const DMGrowBuf psrc, const DMC64ImageFormat *fmt)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1389 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1390 int res = DMERR_OK;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1391 const Uint8 codeBook1, codeBook2;
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1392 DMGrowBuf dst, src;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1393 DMCompParams cfg;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1394 Uint8 data;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1395
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	1396 // 1b7e-67e8 decoded by original depacker
12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	1397 // 1c00-67e8 is the actual area used tho
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1398 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1399 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1400 cfg.flags = DM_COMP_OUTPUT_BACKWARDS \| DM_COMP_INPUT_BACKWARDS \| DM_COMP_OUTPUT_CROP_END;
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1401 cfg.rleMarkerB = 0xfe;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1402 cfg.cropOutLen = 0x67e8 - 0x1c00;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1403
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1404 // Codebooks: #1 is trampoline table markers, #2 is RLE data table
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1405 codeBook1 = psrc->data + 0x81 - 2;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1406 codeBook2 = psrc->data + 0x85 - 2;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1407
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1408 // Allocate output buffer
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1409 if ((res = dmGrowBufAlloc(&dst, 641024, 41024)) != DMERR_OK)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1410 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1411
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1412 // As we need to modify the offs, etc. but not the data,
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1413 // we will just make a shallow copy of the DMGrowBuf struct
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1414 dmGrowBufConstCopy(&src, psrc);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1415 dmSetupRLEBuffers(&dst, &src, &cfg);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1416
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1417 while ((res = fmtTruePaintGetByte(&src, &data, -1)) == DMERR_OK)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1418 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1419 unsigned int count = 1;
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1420 bool found = false;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1421
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1422 for (int n = 0; n < 8; n++)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1423 if (codeBook1[n] == data && !found)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1424 {
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1425 found = true;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1426 switch (n)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1427 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1428 case 4: // Y = 4, JTO = $0B
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1429 if ((res = fmtTruePaintGetByte(&src, &data, n)) != DMERR_OK)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1430 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1431
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1432 count = data;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1433 if (data == 0)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1434 goto finish;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1435
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1436 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1437
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1438 case 1: // Y = 1, JTO = $17
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1439 count += 2;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1440 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1441
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1442 case 0: // Y = 0, JTO = $19
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1443 if ((res = fmtTruePaintGetByte(&src, &data, n)) != DMERR_OK)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1444 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1445 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1446
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1447 case 2: // Y = 2, JTO = $07
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1448 if ((res = fmtTruePaintGetByte(&src, &data, n)) != DMERR_OK)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1449 goto out;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1450
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1451 count = data;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	1452 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1453
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1454 case 3: // Y = 3, JTO = $0B
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1455 count += 2;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1456 data = 0;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1457 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1458
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1459 default: // Y = [5..8], JTO = $00
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1460 count++;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1461 data = codeBook2[n];
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1462 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1463 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1464 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1465
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1466 if ((res = dmGenericRLEOutputRun(&dst, &cfg, data, count)) != DMERR_OK)
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1467 goto out;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1468 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1469
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1470 finish:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1471 dmFinishRLEBuffers(&dst, &src, &cfg);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1472 res = dmC64DecodeGenericBMP(img, &dst, fmt);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1473
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1474 out:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	1475 dmGrowBufFree(&dst);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1476 return res;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1477 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1478
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1479
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1480 static int fmtGetPixelFlinterlazer(DMC64ScanLine *scan,
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1481 const DMC64Image *img, const int rasterX, const int rasterY)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1482 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1483 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1484 const int vbank = rasterY & 7;
2302 7c26b5f86ff7 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 2301 diff changeset	1485 Uint8 color1, color2, bgcol = img->bgcolor;
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1486 int res;
2300 a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	1487
a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	1488 if ((res = dmC64GetGenericMCPixel(&color1, img, bmoffs, scroffs, vshift, vbank , 0, 0, bgcol)) != DMERR_OK \|\|
a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	1489 (res = dmC64GetGenericMCPixel(&color2, img, bmoffs, scroffs, vshift, vbank + 8, 1, 0, bgcol)) != DMERR_OK)
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1490 return res;
2300 a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	1491
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1492 (scan->col) = (color1 D64_NCOLORS) + color2;
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1493 return DMERR_OK;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1494 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1495
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1496
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1497 enum
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1498 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1499 I_BRK = 0x00,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1500 I_RTS = 0x60,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1501 I_LDA_IMD = 0xa9,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1502 I_STA_ABS = 0x8d,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1503 };
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1504
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1505
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1506 static int fmtDecode6502SpeedCode(const DMGrowBuf buf, DMC64Image img, const int cbank)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1507 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1508 size_t reg_pc = 0;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1509 Uint8 reg_accu = 0;//, reg_x = 0, reg_y = 0;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1510 Uint16 reg_ptr;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1511
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1512 while (reg_pc < buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1513 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1514 Uint8 instr = buf->data[reg_pc++];
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1515
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1516 switch (instr)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1517 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1518 case I_LDA_IMD:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1519 if (reg_pc >= buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1520 goto out;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1521
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1522 reg_accu = buf->data[reg_pc++];
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1523 break;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1524
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1525 case I_STA_ABS:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1526 if (reg_pc >= buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1527 goto out;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1528 reg_ptr = buf->data[reg_pc++];
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1529
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1530 if (reg_pc >= buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1531 goto out;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1532 reg_ptr \|= buf->data[reg_pc++] << 8;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1533
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1534 if (reg_ptr >= 0xd800 && reg_ptr <= 0xdbff)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1535 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1536 img->color[cbank].data[reg_ptr - 0xd800] = reg_accu;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1537 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1538 break;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1539
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1540 case I_RTS:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1541 return DMERR_OK;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1542
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1543 default:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1544 return DMERR_INVALID_DATA;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1545 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1546 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1547
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1548 out:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1549 return DMERR_INVALID_DATA;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1550 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1551
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1552
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1553 static int fmtDecodeFlinterlazer(const DMC64EncDecOp op, DMC64Image img,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1554 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1555 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1556 DMGrowBuf tmp;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1557 (void) op;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1558 (void) fmt;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1559
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1560 // Flinterlazer stores color RAMs as speedcode, so we need to
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1561 // decode some 6510 instructions to get the data.
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1562 return fmtDecode6502SpeedCode(
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1563 dmGrowBufConstCopyOffsSize(&tmp, buf, 0, 0x17b2), img, 0);
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1564 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1565
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1566
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1567 static int fmtProbeCosmosDesignsHiresManager(const DMGrowBuf buf, const DMC64ImageFormat fmt)
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1568 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1569 if (buf->len > 32 && dmCompareAddr16(buf, 0, fmt->addr))
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1570 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1571 // Packed variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1572 if (fmt->size == 0 &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1573 dmCompareAddr16(buf, 2, fmt->addr + buf->len - 3) &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1574 dmCompareAddr16(buf, 4, 0x7ff2))
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1575 return DM_PROBE_SCORE_MAX;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1576
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1577 // Unpacked variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1578 if (fmt->size != 0 && fmt->size == buf->len)
2168 b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1579 {
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1580 // In the unpacked format the first 0x40 bytes should be 0xff
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1581 for (size_t offs = 2; offs < 0x42; offs++)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1582 if (buf->data[offs] != 0xff)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1583 return DM_PROBE_SCORE_GOOD;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1584
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1585 return DM_PROBE_SCORE_MAX;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1586 }
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1587 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1588
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1589 return DM_PROBE_SCORE_FALSE;
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1590 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1591
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1592
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1593 static int fmtDecodeCosmosDesignsHiresManagerPacked(DMC64Image img, const DMGrowBuf psrc, const DMC64ImageFormat *fmt)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1594 {
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1595 const size_t baseAddr = 0x4000;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1596 const size_t dstSize = 0x8000 - baseAddr;
2604 1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1597 DMGrowBuf tmp;
1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1598 Uint8 *dstBuf;
1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1599 size_t dstOffs, srcOffs;
1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1600 int res;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1601
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1602 // Allocate output buffer
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1603 if ((dstBuf = dmMalloc0(dstSize)) == NULL)
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1604 {
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1605 return dmError(DMERR_MALLOC,
2624 75382239c95c Print format name in Cosmos Designs Hires Manager RLE unpacker error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2623 diff changeset	1606 "%s: Could not allocate memory for RLE decoding buffer.\n",
75382239c95c Print format name in Cosmos Designs Hires Manager RLE unpacker error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2623 diff changeset	1607 fmt->name);
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1608 }
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1609
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1610 // Setup input and output offsets
0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1611 srcOffs = psrc->len - 1;
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1612 dstOffs = 0x7ff2 - baseAddr - 1;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1613
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1614 while (dstOffs > 0 && srcOffs > 0)
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1615 {
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1616 // Get one byte of data
2604 1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1617 Uint8 data = psrc->data[srcOffs];
1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1618 size_t ncount;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1619
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1620 // Current data byte tells us the mode
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1621 if (data == 0)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1622 {
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1623 // RLE run
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1624 if (srcOffs < 3)
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1625 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1626 res = dmError(DMERR_INVALID_DATA,
2624 75382239c95c Print format name in Cosmos Designs Hires Manager RLE unpacker error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2623 diff changeset	1627 "%s: RLE: Invalid data/out of data for run sequence.\n",
75382239c95c Print format name in Cosmos Designs Hires Manager RLE unpacker error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2623 diff changeset	1628 fmt->name);
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1629 goto out;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1630 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1631
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1632 ncount = psrc->data[--srcOffs];
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1633 data = psrc->data[--srcOffs];
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1634
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1635 if (dstOffs < ncount)
2604 1c80099fe47e Cleanup CDHP decoder slightly. Matti Hamalainen <ccr@tnsp.org> parents: 2603 diff changeset	1636 break;;
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1637
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1638 dstOffs -= ncount;
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1639
0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1640 for (size_t n = 0; n < ncount + 1; n++)
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1641 dstBuf[dstOffs + n] = data;
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1642
0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1643 srcOffs--;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1644 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1645 else
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1646 {
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1647 // Literal run of data bytes
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1648 ncount = data;
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1649 if (srcOffs < ncount)
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1650 ncount = srcOffs;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1651
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1652 if (dstOffs < ncount)
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1653 ncount = dstOffs;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1654
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1655 srcOffs -= ncount;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1656 dstOffs -= ncount - 1;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1657
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1658 for (size_t n = 0; n < ncount; n++)
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1659 dstBuf[dstOffs + n] = psrc->data[srcOffs + n];
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1660 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1661 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1662
2152 44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1663 // Fixups that the original decoder does, not necessary really
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1664 dstBuf[0x7ff0 - baseAddr] = 0x03;
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1665 dstBuf[0x7ffe - baseAddr] = dstBuf[4];
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1666
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1667 for (size_t n = 0; n < 0x40; n++)
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1668 dstBuf[n] = 0xff;
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1669
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1670 for (size_t n = 0; n < 0x100; n++)
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1671 dstBuf[0x40 + n] = 0x00;
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1672
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1673 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCreateFrom(&tmp, dstBuf, dstSize), fmt);
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1674
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1675 out:
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1676 dmFree(dstBuf);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1677 return res;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1678 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1679
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1680
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1681 static const char *fmtFunPaint2_MagicID = "FUNPAINT (MT) ";
9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1682 #define fmtFunPaint2_Header_Size (0x10)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1683
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1684
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1685 static int fmtProbeFunPaint2(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1686 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1687 if (buf->len > 30 &&
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1688 DM_MEMCMP_LEN(buf->data + 2, fmtFunPaint2_MagicID) == 0)
1777 a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1689 {
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1690 // Unpacked variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1691 if (fmt->size != 0 && buf->data[14 + 2] == 0)
1777 a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1692 return DM_PROBE_SCORE_MAX;
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1693
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1694 // Packed variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1695 if (fmt->size == 0 && buf->data[14 + 2] != 0)
1777 a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1696 return DM_PROBE_SCORE_MAX;
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1697 }
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1698
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1699 return DM_PROBE_SCORE_FALSE;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1700 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1701
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1702
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1703 static int fmtDecodeFunPaint2(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1704 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1705 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1706 DMGrowBuf tmp;
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1707
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1708 // Check if the data is compressed
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1709 if (buf->data[14])
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1710 {
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1711 DMGrowBuf mem;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1712 DMCompParams cfg;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1713
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1714 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1715 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1716 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1717 cfg.rleMarkerB = buf->data[15];
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	1718
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1719 dmGrowBufCopyOffs(&tmp, buf, fmtFunPaint2_Header_Size, 1);
1749 feaf5cf07603 Apparently Fun Paint 2 also saves one byte less than it should with the Matti Hamalainen <ccr@tnsp.org> parents: 1748 diff changeset	1720 tmp.len = tmp.size;
feaf5cf07603 Apparently Fun Paint 2 also saves one byte less than it should with the Matti Hamalainen <ccr@tnsp.org> parents: 1748 diff changeset	1721
1598 b5e0f28f1842 Adjust Fun Paint 2 decoding now that the RLE decoding is fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1594 diff changeset	1722 if ((res = dmDecodeGenericRLEAlloc(
1749 feaf5cf07603 Apparently Fun Paint 2 also saves one byte less than it should with the Matti Hamalainen <ccr@tnsp.org> parents: 1748 diff changeset	1723 &mem, &tmp, &cfg)) == DMERR_OK)
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1724 res = dmC64DecodeGenericBMP(img, &mem, fmt);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1725
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1726 dmGrowBufFree(&mem);
1749 feaf5cf07603 Apparently Fun Paint 2 also saves one byte less than it should with the Matti Hamalainen <ccr@tnsp.org> parents: 1748 diff changeset	1727 dmGrowBufFree(&tmp);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1728 }
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1729 else
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1730 {
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1731 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCopyOffs(&tmp, buf, fmtFunPaint2_Header_Size), fmt);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1732 }
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1733
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1734 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1735 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1736
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1737
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1738 static int fmtEncodeFunPaint2Unpacked(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1739 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1740 // Add the header bits
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1741 if (!dmGrowBufPut(buf, (Uint8 *) fmtFunPaint2_MagicID, strlen(fmtFunPaint2_MagicID)) \|\|
1838 d02514ceed91 Fix Fun Paint 2 packed variant writing, it was missing one byte (the "is packed" flag). Matti Hamalainen <ccr@tnsp.org> parents: 1834 diff changeset	1742 !dmGrowBufPutU8(buf, 0) \|\| // 0 == unpacked variant
d02514ceed91 Fix Fun Paint 2 packed variant writing, it was missing one byte (the "is packed" flag). Matti Hamalainen <ccr@tnsp.org> parents: 1834 diff changeset	1743 !dmGrowBufPutU8(buf, 0)) // RLE marker byte (not used in unpacked)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1744 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1745
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1746 return dmC64EncodeGenericBMP(false, buf, img, fmt);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1747 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1748
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1749
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1750 static int fmtEncodeFunPaint2Packed(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1751 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1752 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1753 DMGrowBuf mem;
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	1754 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1755
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1756 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	1757 if ((res = dmC64EncodeGenericBMP(true, &mem, img, fmt)) != DMERR_OK)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1758 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1759
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1649 diff changeset	1760 // Analyze and setup RLE
1711 4fd94bf558b3 Add function name field to DMCompParams struct and set it in places where we use DMCompParams. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1761 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1762 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1763 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	1764 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1765 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1766
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1767 if ((res = dmGenericRLEAnalyze(&mem, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1768 goto out;
1661 dc3fbd130db7 RLE analyze was ran before setting up the compression config. Oops. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1769
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1770 // Add the header bits
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1771 if (!dmGrowBufPut(buf, (Uint8 *) fmtFunPaint2_MagicID, strlen(fmtFunPaint2_MagicID)) \|\|
1838 d02514ceed91 Fix Fun Paint 2 packed variant writing, it was missing one byte (the "is packed" flag). Matti Hamalainen <ccr@tnsp.org> parents: 1834 diff changeset	1772 !dmGrowBufPutU8(buf, 1) \|\| // non-zero == packed variant
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1773 !dmGrowBufPutU8(buf, cfg.rleMarkerB))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1774 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1775 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1776 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1777 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1778
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1779 // And now RLE compress the data to the existing buffer
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1780 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1781
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1782 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1783 dmGrowBufFree(&mem);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1784 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1785 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1786
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1787
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1788 static int fmtGetPixelFunPaint2(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1789 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1790 {
2306 e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1791 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1792 const int bitmap = rasterX & 1;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1793 Uint8 bgcol = (unsigned) rasterY < img->extraData[0].size ?
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1794 img->extraData[0].data[rasterY] : img->bgcolor;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1795
2306 e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1796 (void) vshift;
e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1797
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1798 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1799 bmoffs, scroffs,
2306 e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1800 6 - (rasterX & 6),
e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1801 yb + (bitmap * 8),
2222 75b5bb490f38 Add & 15 to deeper helper functions and remove it from unnecessary places. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	1802 bitmap, 0, bgcol);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1803 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1804
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1805
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1806 static int fmtGetPixelBFLI(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1807 const DMC64Image *img, const int rasterX, const int rasterY)
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1808 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1809 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1810 const int vbb = rasterY < 200 ? 0 : 1;
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	1811 const int vbank = (rasterY & 7) + (vbb * 8);
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1812
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1813 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1814 bmoffs & 0x1fff, scroffs & 0x3ff,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1815 vshift, vbank,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1816 vbb, 0, img->bgcolor);
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1817 }
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1818
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1819
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1820 static int fmtGetPixelPentelPaint(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1821 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1822 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1823 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2595 ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	1824 const int sprY = rasterY / D64_SPR_HEIGHT_PX;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	1825 const int sprYD = rasterY % D64_SPR_HEIGHT_PX;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	1826 const int sprX = rasterX / D64_SPR_WIDTH_PX;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	1827 const int sprXD = (rasterX % D64_SPR_WIDTH_PX) / 8;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	1828 const int offs = (sprY * 8 + sprX) * D64_SPR_SIZE + (sprYD * D64_SPR_WIDTH_UT) + sprXD;
1860 01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	1829 const int mask = 1 << (7 - (rasterX & 7));
2163 1e7d80bfc8f1 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2161 diff changeset	1830 int res;
1860 01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	1831
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1832 Uint8 color1,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1833 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1834 color3 = img->extraData[0].data[offs + D64_SPR_SIZE * 155] & mask ? img->d022 : 0;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1835
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1836 if ((res = dmC64GetGenericSCPixel(&color1, img, bmoffs, scroffs, vshift, 0, 0)) != DMERR_OK)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1837 return res;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1838
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1839 *(scan->col) = color3 ? color3 : ( color2 ? color2 : color1 );
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1840 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1841 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1842
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1843
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1844 // Horizontal character X-offset and scanline Y-offset
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1845 #define DM_CREST_SHFLI_IMG_XOFFS 14
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1846 #define DM_CREST_SHFLI_IMG_YOFFS 1
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1847
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1848 // True image width and height in character blocks
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1849 #define DM_CREST_SHFLI_IMG_WIDTH (4 * D64_SPR_WIDTH_UT)
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1850 #define DM_CREST_SHFLI_IMG_HEIGHT 21
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1851
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1852 #define DM_CREST_SHFLI_BANKS 8
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1853 #define DM_CREST_SHFLI_PTRS 8
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1854
2607 2cda64a11715 Rename an array. Matti Hamalainen <ccr@tnsp.org> parents: 2606 diff changeset	1855 static const Uint8 fmtCrestSHFLI_sprite_pointers[DM_CREST_SHFLI_BANKS][DM_CREST_SHFLI_PTRS] =
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1856 {
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1857 { 0x80, 0x84, 0x85, 0x89, 0x8A, 0x8E, 0x8F, 0x93 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1858 { 0x94, 0x98, 0x99, 0x9D, 0x9E, 0xA2, 0xA3, 0xA7 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1859 { 0xA8, 0xAC, 0xAD, 0xB1, 0xB2, 0xB6, 0xB7, 0xBB },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1860 { 0xBC, 0xC0, 0xC1, 0xC5, 0xC6, 0xCA, 0xCB, 0xCF },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1861 { 0xD0, 0xD4, 0xD5, 0xD9, 0xDA, 0xDE, 0xDF, 0xE3 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1862 { 0xE4, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1863 { 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1864 { 0xF7, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E },
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1865 };
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1866
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1867
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1868 static const Uint8 fmtCrestSHFLI_MagicID_Packed[] =
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1869 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1870 0x83, 0x92, 0x85, 0x93, 0x94,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1871 };
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1872
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1873
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1874 static int fmtProbeCrestSHFLI(const DMGrowBuf buf, const DMC64ImageFormat fmt)
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1875 {
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1876 // Unpacked variant
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1877 if (buf->len == fmt->size &&
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1878 dmCompareAddr16(buf, 0, fmt->addr))
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1879 {
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1880 int score = DM_PROBE_SCORE_MAYBE;
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1881 for (int nbank = 0; nbank < DM_CREST_SHFLI_BANKS; nbank++)
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1882 {
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1883 if (memcmp(buf->data + 2 + (nbank * 0x0400) + 0x03f8,
2607 2cda64a11715 Rename an array. Matti Hamalainen <ccr@tnsp.org> parents: 2606 diff changeset	1884 fmtCrestSHFLI_sprite_pointers[nbank], DM_CREST_SHFLI_PTRS) == 0)
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1885 score += DM_PROBE_SCORE_GOOD;
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1886 }
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1887 return score;
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1888 }
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1889
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1890 // Packed variant
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1891 if (dmCompareAddr16(buf, 0, fmt->addr) &&
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1892 buf->len > sizeof(fmtCrestSHFLI_MagicID_Packed) &&
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1893 DM_MEMCMP_SIZE(buf->data + buf->len - sizeof(fmtCrestSHFLI_MagicID_Packed), fmtCrestSHFLI_MagicID_Packed) == 0)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1894 return DM_PROBE_SCORE_MAX;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1895
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	1896 return DM_PROBE_SCORE_FALSE;
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1897 }
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1898
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1899
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1900 static int fmtDecodeCrestSHFLIPacked(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1901 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1902 int res;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1903 DMGrowBuf tmp, mem;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1904 DMCompParams cfg;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1905
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1906 // Compression is typical RLE, with first byte being the RLE marker byte etc.
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1907 // However, as a difference to the uncompressed files, only the data of the
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1908 // 96 pixels wide area (4 sprite widths) x 168 tall is saved.
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1909 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1910 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	1911 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1 \| DM_COMP_RLE_ZERO_COUNT_MAX;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1912 cfg.rleMarkerB = buf->data[0];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1913
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1914 if ((res = dmDecodeGenericRLEAlloc(
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1915 &mem, dmGrowBufConstCopyOffs(&tmp, buf, 1), &cfg)) == DMERR_OK)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1916 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1917 const size_t fmtUncompSize = 0x1ff0;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1918 const size_t dstSize = 16 * 1024;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1919 Uint8 dstBuf, sptr, *dptr;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1920
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1921 // Check uncompressed size?
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1922 if (mem.len != fmtUncompSize)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1923 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1924 res = dmError(DMERR_INVALID_DATA,
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2378 diff changeset	1925 "%s: Unexpected uncompressed data size %" DM_PRIu_SIZE_T
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2378 diff changeset	1926 " bytes (should be %" DM_PRIu_SIZE_T ").\n",
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1927 cfg.func, mem.len, fmtUncompSize);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1928 goto out;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1929 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1930
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1931 // Allocate output buffer
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1932 if ((dstBuf = dmMalloc0(dstSize)) == NULL)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1933 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1934 res = dmError(DMERR_MALLOC,
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2378 diff changeset	1935 "%s: Could not allocate temporary memory buffer of %" DM_PRIu_SIZE_T " bytes.\n",
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1936 cfg.func, dstSize);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1937 goto out;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1938 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1939
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1940 // Now that we have the uncompressed data (0x1ff0 bytes), we need to
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1941 // re-arrange it. The data is as follows ..
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1942 //
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1943 // 0x0000 - sprite data for 64 sprites
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1944 // 0x1000 - bitmap (12 * 21 bytes)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1945 // 0x1800 - screen RAMs (12 * 21 bytes) x 8 banks
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1946 // 0x1fe8 - sprite color #1
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1947 // 0x1fe9 - sprite color #2
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1948 //
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1949
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1950 // Copy sprite colors
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1951 sptr = mem.data + 0x1fe8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1952 dptr = dstBuf + 0x03e8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1953 dptr[0] = sptr[0];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1954 dptr[1] = sptr[1];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1955
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1956 // First, clear and set some defaults that are not saved in the file
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1957 for (int nbank = 0; nbank < DM_CREST_SHFLI_BANKS; nbank++)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1958 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1959 dptr = dstBuf + nbank * 0x0400;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1960
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1961 // Set preset screen RAM for other area
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1962 memset(dptr, 0xff, fmt->format->chWidth * fmt->format->chHeight);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1963
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1964 // Copy sprite data points
2607 2cda64a11715 Rename an array. Matti Hamalainen <ccr@tnsp.org> parents: 2606 diff changeset	1965 memcpy(dptr + 0x03f8, &fmtCrestSHFLI_sprite_pointers[nbank], DM_CREST_SHFLI_PTRS);
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1966 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1967
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1968 // Now we copy and transform the bitmap and screen RAM data.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1969 for (int yc = 0; yc < DM_CREST_SHFLI_IMG_HEIGHT * 8; yc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1970 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1971 const int syy = yc / 8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1972 const int syd = yc & 7;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1973
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1974 // In the image the first visible scanline is unused, but in
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1975 // the compressed version data starts right away, so we offset
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1976 // the destination Y coordinate by one.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1977 const int dyc = yc + DM_CREST_SHFLI_IMG_YOFFS;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1978 const int dyy = dyc / 8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1979 const int dyd = dyc & 7;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1980
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1981 // Format of the bitmap data is one horizontal pixel row (12 bytes)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1982 // times 21*8 rows, e.g. the data is "linear" rows of bytes and not
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1983 // arranged in usual c64 bitmap "char" order. Thus we reorder it.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1984 sptr = mem.data + 0x1000 + DM_CREST_SHFLI_IMG_WIDTH * (syd + 8 * syy);
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1985 dptr = dstBuf + 0x2000 + DM_CREST_SHFLI_IMG_XOFFS * 8 + (fmt->format->chWidth * dyy * 8) + dyd;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1986
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1987 for (int xc = 0; xc < DM_CREST_SHFLI_IMG_WIDTH; xc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1988 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1989 dptr[xc * 8] = sptr[xc];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1990 sptr[xc] = 0xaa;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1991 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1992
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1993 // A bit similar arrangement is used for the screen RAM data.
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1994 // Each row of 12 bytes of data is for a bank. Next row is for
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1995 // next bank, etc.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1996 sptr = mem.data + 0x1800 + DM_CREST_SHFLI_IMG_WIDTH * syd + DM_CREST_SHFLI_IMG_WIDTH * 8 * syy;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1997 dptr = dstBuf + DM_CREST_SHFLI_IMG_XOFFS + 0x0400 * dyd + fmt->format->chWidth * dyy;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1998
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1999 for (int xc = 0; xc < DM_CREST_SHFLI_IMG_WIDTH; xc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2000 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2001 dptr[xc] = sptr[xc];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2002 sptr[xc] = 0xaa;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2003 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2004 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2005
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2006 // The sprite data is also transformed similarly, data is
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2007 // in same scanline format as the bitmap. Thus we need to
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2008 // place it where it belongs based on the sprite pointers.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2009 for (int yc = 0; yc < DM_CREST_SHFLI_IMG_HEIGHT * 8; yc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2010 {
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2011 const int yd = yc % D64_SPR_HEIGHT_PX;
2607 2cda64a11715 Rename an array. Matti Hamalainen <ccr@tnsp.org> parents: 2606 diff changeset	2012 const Uint8 *sprPtrs = fmtCrestSHFLI_sprite_pointers[yc % 8];
2190 0447f4c6c32b Fix a const discard issue. Matti Hamalainen <ccr@tnsp.org> parents: 2189 diff changeset	2013 Uint8 sp1, sp2, *dp;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2014
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2015 dptr = dstBuf + D64_SPR_WIDTH_UT * yd;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2016 sp1 = mem.data + DM_CREST_SHFLI_IMG_WIDTH * yc;
2191 488130151097 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2190 diff changeset	2017 sp2 = sp1 + 0x0800;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2018
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2019 for (int xc = 0; xc < DM_CREST_SHFLI_IMG_WIDTH / D64_SPR_WIDTH_UT; xc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2020 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2021 dp = dptr + D64_SPR_SIZE * sprPtrs[xc];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2022 for (int xd = 0; xd < D64_SPR_WIDTH_UT; xd++)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2023 dp[xd] = *sp1++;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2024
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2025 dp = dptr + D64_SPR_SIZE * sprPtrs[xc + 4];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2026 for (int xd = 0; xd < D64_SPR_WIDTH_UT; xd++)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2027 dp[xd] = *sp2++;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2028 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2029 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2030
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2031 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCreateFrom(&tmp, dstBuf, dstSize), fmt);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2032 dmFree(dstBuf);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2033 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2034
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2035 out:
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2036 dmGrowBufFree(&mem);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2037
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2038 return res;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2039 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2040
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2041
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2042 static int fmtGetSpritePixelCrestSHFLI(DMC64ScanLine *scan,
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2043 const DMC64Image *img, const int sindex, const int cindex,
2595 ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2044 const int sprXD, const int sprYD, const int mask)
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2045 {
2595 ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2046 const size_t offs = sindex * D64_SPR_SIZE + (D64_SPR_WIDTH_UT * sprYD) + sprXD;
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2047
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2048 if (offs >= img->extraData[14].size)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2049 return DMERR_BOUNDS;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2050
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2051 if (img->extraData[14].data[offs] & mask)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2052 {
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2053 *(scan->col) = img->extraData[15].data[cindex];
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2054 return DMERR_OK;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2055 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2056
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2057 return -1;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2058 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2059
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2060
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2061 static int fmtGetPixelCrestSHFLI(DMC64ScanLine *scan,
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2062 const DMC64Image *img, const int rasterX, const int rasterY)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2063 {
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2064 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2065 const int sprOffsetX = DM_CREST_SHFLI_IMG_XOFFS * 8,
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2066 sprOffsetY = DM_CREST_SHFLI_IMG_YOFFS;
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2067 const int nbank = rasterY & 7;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2068 int res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2069
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2070 if (rasterY / 8 >= DM_CREST_SHFLI_IMG_HEIGHT)
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2071 {
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2072 *(scan->col) = 0x0f;
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2073 return DMERR_OK;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2074 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2075
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2076 if (rasterY >= sprOffsetY &&
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2077 rasterX >= sprOffsetX &&
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2078 rasterX < sprOffsetX + 4 * D64_SPR_WIDTH_PX)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2079 {
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2080 const int localX = rasterX - sprOffsetX,
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2081 localY = rasterY - sprOffsetY;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2082 const int sbank = localY & 7;
2595 ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2083 const int sprYD = localY % D64_SPR_HEIGHT_PX;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2084 const int sprX = localX / D64_SPR_WIDTH_PX;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2085 const int sprXD = (localX % D64_SPR_WIDTH_PX) / 8;
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2086 const int mask = 1 << (7 - (localX & 7));
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2087
2595 ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2088 const int sprOffs = sprX & 3;
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2089 const int sprIndex1 = img->extraData[sbank].data[sprOffs];
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2090 const int sprIndex2 = img->extraData[sbank].data[sprOffs + 4];
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2091
ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2092 if ((res = fmtGetSpritePixelCrestSHFLI(scan, img, sprIndex1, 0, sprXD, sprYD, mask)) == DMERR_OK \|\|
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2093 res != -1)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2094 return res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2095
2595 ee6225ed27ec Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2591 diff changeset	2096 if ((res = fmtGetSpritePixelCrestSHFLI(scan, img, sprIndex2, 1, sprXD, sprYD, mask)) == DMERR_OK \|\|
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2097 res != -1)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2098 return res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2099 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2100
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2101 if ((res = dmC64GetGenericSCPixel(scan->col, img, bmoffs, scroffs, vshift, nbank, 0)) != DMERR_OK)
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2102 return res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2103
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2104 return DMERR_OK;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2105 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2106
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2107
2623 da81e524162e Rename a function and HCB format title to include BD (for Booze Design) Matti Hamalainen <ccr@tnsp.org> parents: 2620 diff changeset	2108 static int fmtGetPixelBDHCB(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2109 const DMC64Image *img, const int rasterX, const int rasterY)
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2110 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2111 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2112 const int vbank = (rasterY / 4) & 1;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2113 const int ry = rasterY / 5;
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2114
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2115 Uint8 bgcol = (unsigned) ry < img->extraData[0].size ?
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2116 img->extraData[0].data[ry] : img->bgcolor;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2117
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2118 return dmC64GetGenericMCPixel(scan->col, img,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2119 bmoffs, scroffs,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	2120 vshift, vbank,
2222 75b5bb490f38 Add & 15 to deeper helper functions and remove it from unnecessary places. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	2121 0, vbank, bgcol);
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2122 }
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2123
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2124
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2125 static int fmtGetPixelCrestHIFLIorCDHM(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2126 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2127 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2128 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	2129
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2130 return dmC64GetGenericSCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	2131 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	2132 vshift, rasterY & 7, 0);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2133 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2134
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2135
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2136 static int fmtGetPixelECI(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2137 const DMC64Image *img, const int rasterX, const int rasterY)
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	2138 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2139 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	2140 const int vbank = rasterY & 7;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2141 Uint8 color1, color2;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2142 int res;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	2143
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2144 if ((res = dmC64GetGenericSCPixel(&color1, img, bmoffs, scroffs, vshift, vbank , 0)) != DMERR_OK \|\|
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2145 (res = dmC64GetGenericSCPixel(&color2, img, bmoffs, scroffs, vshift, vbank + 8, 1)) != DMERR_OK)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2146 return res;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2147
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	2148 (scan->col) = (color1 D64_NCOLORS) + color2;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2149 return DMERR_OK;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	2150 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	2151
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	2152
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	2153 static int fmtProbeECIPacked(const DMGrowBuf buf, const DMC64ImageFormat fmt)
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2154 {
2599 c3c1d3c75f53 s/DM_PROBE_SCORE_false/DM_PROBE_SCORE_FALSE/g Matti Hamalainen <ccr@tnsp.org> parents: 2596 diff changeset	2155 int score = DM_PROBE_SCORE_FALSE;
2168 b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2156
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2157 if (buf->len > 128 &&
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2158 dmCompareAddr16(buf, 0, fmt->addr))
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2159 {
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2160 size_t i, n;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2161
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2162 // Count statistics about used byte values and compare to
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2163 // value in buf[2] which is the RLE marker
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2164 for (n = 0, i = 3; i < buf->len; i++)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2165 if (buf->data[i] == buf->data[2]) n++;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2166
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2167 if (n > 50)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2168 score = DM_PROBE_SCORE_GOOD;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2169 else
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2170 if (n > 25)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2171 score = DM_PROBE_SCORE_AVG;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2172 else
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2173 if (n > 10)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2174 score = DM_PROBE_SCORE_MAYBE;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2175 }
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2176
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2177 if (// Try to avoid misprobe of Crest Hires FLI Designer and Cosmos Design format
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2178 buf->len == 16386 \|\|
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2179 // Face Painter
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2180 buf->len == 10004)
2168 b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2181 score /= 3;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2182
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	2183 return score;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2184 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2185
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2186
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2187 static int fmtDecodeECIPacked(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2188 {
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2189 int res;
2170 7c4c9013e412 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2169 diff changeset	2190 DMGrowBuf mem, tmp;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2191 DMCompParams cfg;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2192
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2193 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	2194 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	2195 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2196 cfg.rleMarkerB = buf->data[0];
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2197
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2198 if ((res = dmDecodeGenericRLEAlloc(
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	2199 &mem, dmGrowBufConstCopyOffs(&tmp, buf, 1), &cfg)) == DMERR_OK)
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2200 res = dmC64DecodeGenericBMP(img, &mem, fmt);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2201
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2202 dmGrowBufFree(&mem);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2203 return res;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2204 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2205
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2206
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2207 static int fmtEncodeECIPacked(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2208 {
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2209 int res;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2210 DMGrowBuf tmp;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2211 DMCompParams cfg;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2212
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2213 // Encode the data to temp buffer
2586 9807ae37ad69 Require stdbool.h, we require C11 now. Matti Hamalainen <ccr@tnsp.org> parents: 2583 diff changeset	2214 if ((res = dmC64EncodeGenericBMP(true, &tmp, img, fmt)) != DMERR_OK)
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2215 goto out;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2216
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2217 // Analyze and setup RLE
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2218 cfg.func = fmt->name;
2606 92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	2219 cfg.type = DM_COMP_TYPE_RLE_MARKER;
92909caccc9e Rename various compression related internal constants. Matti Hamalainen <ccr@tnsp.org> parents: 2605 diff changeset	2220 cfg.flags = DM_COMP_RLE_BYTE_RUNS \| DM_COMP_RLE_ORDER_1;
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2221 cfg.rleMinCountB = 4;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2222 cfg.rleMaxCountB = 255;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2223
2331 6dc64deb6718 Missed on dmGenericRLEAnalyze() call from a previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 2329 diff changeset	2224 if ((res = dmGenericRLEAnalyze(&tmp, &cfg)) != DMERR_OK)
6dc64deb6718 Missed on dmGenericRLEAnalyze() call from a previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 2329 diff changeset	2225 goto out;
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2226
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2227 // Add the header bits
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2228 if (!dmGrowBufPutU8(buf, cfg.rleMarkerB))
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2229 {
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2230 res = DMERR_MALLOC;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2231 goto out;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2232 }
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2233
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2234 // And now RLE compress the data to the existing buffer
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2235 res = dmEncodeGenericRLE(buf, &tmp, &cfg);
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2236
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2237 out:
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2238 dmGrowBufFree(&tmp);
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2239 return res;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2240 }
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2241
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2242
2605 f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2243 static const Uint8 fmtEXON_VHI_Packed_MagicID[] =
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2244 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2245 0x00, 0x00, 0x20, 0x16, 0x08, 0x09, 0x20, 0x05,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2246 0x04, 0x09, 0x14, 0x0f, 0x12, 0x20, 0x16, 0x30,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2247 0x2e, 0x31, 0x20, 0x20, 0x02, 0x19, 0x20, 0x16,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2248 0x0f, 0x0c, 0x03, 0x01, 0x0e, 0x0f, 0x2f, 0x05,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2249 0x18, 0x0f, 0x0e, 0x01,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2250 };
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2251
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2252
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2253 static int fmtProbeEXON_VHI_Packed(const DMGrowBuf buf, const DMC64ImageFormat fmt)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2254 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2255 if (buf->len > 200 &&
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2256 dmCompareAddr16(buf, 0, fmt->addr))
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2257 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2258 // This is a bit heavy-handed, but what can one do
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2259 for (size_t offs = 2; offs < buf->len - sizeof(fmtEXON_VHI_Packed_MagicID); offs++)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2260 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2261 if (DM_MEMCMP_SIZE(buf->data + offs, fmtEXON_VHI_Packed_MagicID) == 0)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2262 return DM_PROBE_SCORE_MAX;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2263 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2264 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2265
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2266 return DM_PROBE_SCORE_FALSE;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2267 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2268
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2269
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2270 static int fmtDecodeEXON_VHI_Packed(DMC64Image img, const DMGrowBuf psrc, const DMC64ImageFormat *fmt)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2271 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2272 DMGrowBuf tmp;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2273 Uint8 *dstBuf;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2274 const size_t dstSize = fmt->size - 2;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2275 size_t dstOffs = 0, srcOffs = 0;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2276 int res;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2277
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2278 // Allocate output buffer
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2279 if ((dstBuf = dmMalloc0(dstSize)) == NULL)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2280 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2281 return dmError(DMERR_MALLOC,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2282 "EXON_VHI: Could not allocate memory for decoding buffer.\n");
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2283 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2284
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2285 while (srcOffs < psrc->len && dstOffs < dstSize)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2286 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2287 // Get one byte of data
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2288 Uint8 data = psrc->data[srcOffs++];
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2289 size_t ncount;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2290
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2291 if (data & 0x80)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2292 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2293 // High bit means end of stream
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2294 break;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2295 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2296 else
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2297 if (data == 0)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2298 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2299 // Zero means literal run
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2300 if (srcOffs > psrc->len)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2301 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2302 res = dmError(DMERR_INVALID_DATA,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2303 "EXON_VHI: Literal sequence out of data.\n");
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2304 goto out;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2305 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2306
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2307 ncount = psrc->data[srcOffs++];
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2308 if (ncount == 0)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2309 ncount = 256;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2310
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2311 if (srcOffs + ncount > psrc->len)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2312 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2313 res = dmError(DMERR_INVALID_DATA,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2314 "EXON_VHI: Literal sequence too long for source data.\n");
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2315 goto out;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2316 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2317
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2318 if (dstOffs + ncount > dstSize)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2319 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2320 res = dmError(DMERR_INVALID_DATA,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2321 "EXON_VHI: Literal sequence too long for destination data.\n");
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2322 goto out;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2323 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2324
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2325 for (size_t n = 0; n < ncount; n++)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2326 dstBuf[dstOffs++] = psrc->data[srcOffs++];
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2327 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2328 else
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2329 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2330 // RLE run
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2331 if (srcOffs + 2 > psrc->len)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2332 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2333 res = dmError(DMERR_INVALID_DATA,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2334 "EXON_VHI: Invalid data/out of data for RLE sequence.\n");
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2335 goto out;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2336 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2337
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2338 ncount = psrc->data[srcOffs++];
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2339 data = psrc->data[srcOffs++];
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2340 if (ncount == 0)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2341 ncount = 256;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2342
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2343 if (dstOffs + ncount > dstSize)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2344 {
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2345 res = dmError(DMERR_INVALID_DATA,
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2346 "EXON_VHI: Invalid data/out of data for RLE sequence.\n");
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2347 goto out;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2348 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2349
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2350 for (size_t n = 0; n < ncount; n++)
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2351 dstBuf[dstOffs++] = data;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2352 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2353 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2354
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2355 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCreateFrom(&tmp, dstBuf, dstSize), fmt);
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2356
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2357 out:
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2358 dmFree(dstBuf);
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2359 return res;
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2360 }
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2361
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	2362
2603 8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2363 static int fmtGetPixelEXON_VHI(DMC64ScanLine *scan,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2364 const DMC64Image *img, const int rasterX, const int rasterY)
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2365 {
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2366 const int
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2367 x = rasterX / 16,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2368 y = rasterY / 8,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2369 yb = rasterY & 7,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2370 yoffs = y * img->fmt->chWidth,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2371 bmoffs = yoffs * 8 + yb + (x * 8),
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2372 scroffs = yoffs + x,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2373 vshift = 7 - ((rasterX / 2) & 7),
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2374 vbitmap = rasterX & 1;
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2375
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2376 return dmC64GetGenericSCPixel(scan->col, img, bmoffs, scroffs, vshift, 0, vbitmap);
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2377 }
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2378
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2379
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2380 //
1795 c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	2381 // Helper macros for defining screen memory layouts
c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	2382 // common for several FLI type image formats
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2383 //
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2384 #define DEF_REPEAT_BLOCK(dop, dtype, start, oindex, bindex, osize, bsize, oflags) \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2385 { (dop), (dtype), (start) + ((osize) * (oindex)), (bindex), (bsize), 0, NULL, NULL, (oflags) }
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2386
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2387 #define DEF_REPEAT_BLOCK_8(dop, dtype, start, sindex, osize, bsize, oflags) \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2388 DEF_REPEAT_BLOCK((dop), (dtype), (start), 0, ((sindex) + 0), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2389 DEF_REPEAT_BLOCK((dop), (dtype), (start), 1, ((sindex) + 1), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2390 DEF_REPEAT_BLOCK((dop), (dtype), (start), 2, ((sindex) + 2), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2391 DEF_REPEAT_BLOCK((dop), (dtype), (start), 3, ((sindex) + 3), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2392 DEF_REPEAT_BLOCK((dop), (dtype), (start), 4, ((sindex) + 4), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2393 DEF_REPEAT_BLOCK((dop), (dtype), (start), 5, ((sindex) + 5), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2394 DEF_REPEAT_BLOCK((dop), (dtype), (start), 6, ((sindex) + 6), (osize), (bsize), (oflags)), \
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2395 DEF_REPEAT_BLOCK((dop), (dtype), (start), 7, ((sindex) + 7), (osize), (bsize), (oflags))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2396
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2397
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2398 //
1861 752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	2399 // Many formats actually share memory layout and other specs, and there are
752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	2400 // packed and unpacked versions of several formats. We'll reuse these here
752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	2401 // through this common formats data array, referred from dmC64ImageFormats[]
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2402 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2403 DMC64ImageCommonFormat dmC64CommonFormats[] =
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2404 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	2405 { // #0: Koala Painter type memory layout
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2406 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2407 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2408 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2409 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2410 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2411 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2412 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2413 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2414 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2415 { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2416 { DO_SET_MEM_LO , DS_BGCOL , 0x2710, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2417 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2418 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2419 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2420
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2421 { // #1: Black Mail FLI Graph
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2422 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2423 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2424 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2425 2, 1,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2426 NULL, NULL,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2427 fmtGetPixelBlackMailFLI,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2428 {
2294 7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	2429 { DO_COPY , DS_EXTRA_DATA , 0x0000, 0, 200 , 0, NULL, NULL, DF_NORMAL },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	2430 { DO_COPY , DS_COLOR_RAM , 0x0100, 0, 0 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2431 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x0500, 0, 0x400, 0, DF_NORMAL),
2294 7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	2432 { DO_COPY , DS_BITMAP_RAM , 0x2500, 0, 0 , 0, NULL, NULL, DF_NORMAL },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	2433
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	2434 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0 , 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	2435 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2436 }
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2437 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2438
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2439 { // #2: Art Studio etc. Hires
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2440 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2441 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2442 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2443 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2444 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2445 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2446 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2447 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2448 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2449 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2450 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2451 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2452
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2453 { // #3: FunPaint II
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2454 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2455 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2456 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2457 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2458 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2459 fmtGetPixelFunPaint2,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2460 {
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2461 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x0000, 0, 0x400, 0, DF_NORMAL),
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2462 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2463 { DO_COPY , DS_EXTRA_DATA , 0x3f48, 0, 100 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2464 { DO_COPY , DS_COLOR_RAM , 0x4000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2465 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x43e8, 8, 0x400, 0, DF_NORMAL),
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2466 { DO_COPY , DS_BITMAP_RAM , 0x63e8, 1, 0 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2467 { DO_COPY , DS_EXTRA_DATA , 0x8328, 0, 100 , 100, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2468 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2469 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2470 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2471 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2472 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2473
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2474 { // #4: DrazPaint 1.x & 2
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2475 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2476 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2477 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2478 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2479 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2480 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2481 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2482 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2483 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2484 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2485 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2486 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2487 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2488 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2489
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2490 { // #5: DrazLace 1.0
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2491 D64_FMT_MC \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2492 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2493 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2494 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2495 NULL, NULL,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	2496 fmtGetPixelDrazLace,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2497 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2498 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2499 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2500 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2501 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2502 { DO_FUNC , 0 , 0x2742, 0, 1, 0, fmtDrazLaceGetLaceType, fmtDrazLaceSetLaceType, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2503 { DO_COPY , DS_BITMAP_RAM , 0x2800, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2504 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2505 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2506 },
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2507
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2508 { // #6: TruePaint
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2509 D64_FMT_MC \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2510 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2511 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2512 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2513 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2514 fmtGetPixelTruePaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2515 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2516 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2517 { DO_SET_MEM_LO , DS_BGCOL , 0x03e8, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2518 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2519 { DO_COPY , DS_BITMAP_RAM , 0x2400, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2520 { DO_COPY , DS_SCREEN_RAM , 0x4400, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2521 { DO_COPY , DS_COLOR_RAM , 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2522 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2523 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2524 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2525 },
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	2526
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2527 { // #7: ECI Graphic Editor Hires FLI
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2528 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2529 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2530 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2531 1, 1,
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	2532 NULL, NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2533 fmtGetPixelECI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2534 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2535 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2536 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x2000, 0, 0x400, 0, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2537 { DO_COPY , DS_BITMAP_RAM , 0x4000, 1, 0, 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2538 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x6000, 8, 0x400, 0, DF_NORMAL),
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2539 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_COLOR, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2540 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2541 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2542 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2543 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2544
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2545 { // #8: Cosmos Designs Hires Manager
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2546 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2547 D64_SCR_WIDTH, 248, // Actually 296 x 192 (=248)
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2548 D64_SCR_CH_WIDTH, 24,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2549 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2550 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2551 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2552 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2553 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2554 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x2000, 0, 0x400, 0, DF_NORMAL),
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2555 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2556 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2557 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2558 },
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2559
2018 1c45b2fb471d Adjust a comment. Matti Hamalainen <ccr@tnsp.org> parents: 2015 diff changeset	2560 { // #9: FBI Crew FLI Designer 1.x & 2.0
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2561 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2562 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2563 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2564 2, 1,
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2565 NULL, NULL,
69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2566 fmtGetPixelFLIDesigner,
69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2567 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2568 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2569 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM, 0x0400, 0, 0x400, 0, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2570 { DO_COPY , DS_BITMAP_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
2545 e028058648ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2544 diff changeset	2571 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2572 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2573 }
69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2574 },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2575
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2576 { // #10: Doodle
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2577 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2578 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2579 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2580 1, 1,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2581 NULL, NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2582 NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2583 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2584 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2585 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2586 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2587 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2588 },
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2589
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2590 { // #11: Crest Super Hires FLI Editor 1.0 (SHF)
2314 87533af8db64 Add format flag for formats that use sprite layer. Matti Hamalainen <ccr@tnsp.org> parents: 2313 diff changeset	2591 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_SPRITES,
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2592 D64_SCR_WIDTH, D64_SCR_HEIGHT,
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	2593 D64_SCR_CH_WIDTH, 24,
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2594 1, 1,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2595 NULL, NULL,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2596 fmtGetPixelCrestSHFLI,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2597 {
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2598 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM, 0x0000, 0 , 0x0400, 0x0400, DF_NORMAL),
b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	2599 DEF_REPEAT_BLOCK_8(DO_COPY, DS_EXTRA_DATA, 0x03f8, 0 , 0x0400, 8, DF_DECODE), // Sprite pointers for each bank
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2600 { DO_COPY , DS_EXTRA_DATA , 0x03e8, 15 , 2 , 0, NULL, NULL, DF_DECODE }, // 2 sprite colors
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2601 { DO_COPY , DS_EXTRA_DATA , 0x0000, 14 , 0x3e00, 0, NULL, NULL, DF_DECODE }, // Lazily copy whole data for sprite data
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2602 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0 , 0 , 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2603 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2604 { DO_LAST , 0 , 0 , 0 , 0 , 0, NULL, NULL, DF_NORMAL },
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2605 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2606 },
2603 8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2607
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2608 { // #12: EXON VHI Editor 0.1
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2609 D64_FMT_HIRES \| D64_FMT_ILACE,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2610 D64_SCR_WIDTH * 2, D64_SCR_HEIGHT,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2611 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2612 1, 1,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2613 NULL, NULL,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2614 fmtGetPixelEXON_VHI,
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2615 {
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2616 { DO_COPY , DS_BITMAP_RAM , 0x2000 - 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2617 { DO_COPY , DS_BITMAP_RAM , 0x4000 - 0x2000, 1, 0, 0, NULL, NULL, DF_NORMAL },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2618 { DO_COPY , DS_SCREEN_RAM , 0x6000 - 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2619 { DO_SET_MEM_LO , DS_D020 , 0x63ea - 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2620
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2621 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES , 0, 0, D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2622 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2623 }
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	2624 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2625 };
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2626
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2627
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2628 //
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2629 // Array with data for supported formats
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2630 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2631 DMC64ImageFormat dmC64ImageFormats[] =
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2632 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2633 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2634 "d2p", "DrazPaint 1.4/2.0 (packed)", 0x5800, 0, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2635 fmtProbeDrazPaint20Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2636 fmtDecodeDrazPaintPacked, fmtEncodeDrazPaintPacked,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2637 { 0 }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2638 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2639
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2640 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2641 "drp", "DrazPaint (unpacked)", 0x5800, 10051, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2642 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2643 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2644 { 0 }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2645 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2646
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2647 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2648 "dlp", "DrazLace 1.0 (packed)", 0x5800, 0, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2649 fmtProbeDrazLace10Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2650 fmtDecodeDrazPaintPacked, fmtEncodeDrazPaintPacked,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2651 { 0 }, &dmC64CommonFormats[5]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2652 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2653
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2654 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2655 "drl", "DrazLace 1.0 (unpacked)", 0x5800, 18242, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2656 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2657 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2658 { 0 }, &dmC64CommonFormats[5]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2659 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2660
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2661 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2662 "bdp5", "Boogie Down Paint 5 (packed)", 0x5000, 0, 0, DM_FMT_RDWR,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2663 fmtProbeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2664 fmtDecodeBDP5Packed, fmtEncodeBDP5Packed,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2665 { 0 }, &dmC64CommonFormats[0] // Memory format is same as Koala
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2666 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2667
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2668 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2669 "vid", "Vidcom 64 (unpacked)", 0x5800, 10050, 0, DM_FMT_RDWR,
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2670 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2671 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2672 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2673 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2674 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2675 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2676 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2677 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2678 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2679 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2680 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2681 { DO_SET_MEM_LO , DS_BGCOL , 0x07e8, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2682 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2683 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2684 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2685 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2686 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2687 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2688 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2689
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2690 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2691 "p64", "Picasso 64 (unpacked)", 0x1800, 10050, 0, DM_FMT_RDWR,
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2692 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2693 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2694 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2695 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2696 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2697 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2698 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2699 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2700 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2701 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2702 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2703 { DO_SET_MEM_LO , DS_BGCOL , 0x07fe, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2704 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2705 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2706 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2707 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2708 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2709 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2710 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2711
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2712 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2713 "mci", "Truepaint (unpacked)", 0x9c00, 19434, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2714 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2715 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2716 { 0 }, &dmC64CommonFormats[6]
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2717 },
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2718
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2719 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2720 "mcip", "Truepaint (packed)", 0x0801, 0, 0, DM_FMT_RD,
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2721 fmtProbeTruePaintPacked,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2722 fmtDecodeTruePaintPacked, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2723 { 0 }, &dmC64CommonFormats[6]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2724 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2725
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2726 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2727 "kla", "Koala Painter (unpacked)", 0x6000, 10003, 0, DM_FMT_RDWR,
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	2728 fmtProbeKoalaPainter,
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2729 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2730 { 0 }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2731 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2732
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2733 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2734 "klp", "Koala Painter (packed)", 0x6000, 0, 0xfe, DM_FMT_RDWR,
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	2735 fmtProbeKoalaPainterPacked,
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	2736 fmtDecodeStaticRLEMarkerMode2, fmtEncodeStaticRLEMarkerMode2,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2737 { 0 }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2738 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2739
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2740 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2741 "aas", "Advanced Art Studio (unpacked)", 0x2000, 10018, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2742 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2743 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2744 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2745 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2746 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2747 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2748 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2749 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2750 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2751 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2752 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2753 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2754 { DO_SET_MEM_LO , DS_D020 , 0x2328, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2755 { DO_SET_MEM_LO , DS_BGCOL , 0x2329, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2756 { DO_COPY , DS_COLOR_RAM , 0x2338, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2757 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2758 },
1593 a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	2759 },
a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	2760 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2761 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2762
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2763 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2764 "ims", "Image System MC (unpacked)", 0x3c00, 10218, 0, DM_FMT_RDWR,
1755 841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2765 NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2766 NULL, NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2767 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2768 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2769 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2770 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2771 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2772 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2773 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2774 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2775 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2776 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2777 { DO_SET_MEM_LO , DS_BGCOL , 0x23ff, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2778 { DO_COPY , DS_SCREEN_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2779 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2780 }
1755 841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2781 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2782 NULL
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2783 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2784
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2785 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2786 "mil", "Micro Illustrator (unpacked)", 0x18dc, 10022, 0, DM_FMT_RDWR \| DM_FMT_BROKEN,
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	2787 fmtProbeMicroIllustrator,
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2788 NULL, NULL,
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2789 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2790 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2791 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2792 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2793 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2794 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2795 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2796 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2797 { DO_COPY , DS_SCREEN_RAM , 20 + 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2798 { DO_COPY , DS_COLOR_RAM , 20 + 1000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2799 { DO_COPY , DS_BITMAP_RAM , 20 + 2000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	2800 // XXX TODO: Unknown where the background color is set, so default to 0x00
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2801 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2802 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3e8 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2803 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3e9 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2804 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3ea , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2805 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3eb , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2806 { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtEncodeMicroIllustrator, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2807 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2808 }
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2809 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2810 NULL
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2811 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2812
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2813 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2814 "cdu", "CDU-Paint (unpacked)", 0x7eef, 10277, 0, DM_FMT_RDWR,
1754 aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2815 NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2816 NULL, NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2817 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2818 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2819 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2820 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2821 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2822 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2823 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2824 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2825 { DO_COPY , DS_BITMAP_RAM , 0x0000 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2826 { DO_COPY , DS_SCREEN_RAM , 0x1f40 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2827 { DO_COPY , DS_COLOR_RAM , 0x2328 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2828 { DO_SET_MEM_LO , DS_BGCOL , 0x2710 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2829 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2830 }
1754 aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2831 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2832 NULL
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2833 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2834
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2835 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2836 "rbp", "Rainbow Painter (unpacked)", 0x5c00, 10242, 0, DM_FMT_RDWR \| DM_FMT_BROKEN,
1763 847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2837 NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2838 NULL, NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2839 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2840 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2841 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2842 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2843 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2844 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2845 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2846 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2847 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2848 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2849 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2850 // XXX TODO: Not sure if the background color is hardcoded ..
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2851 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2852 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2853 }
1763 847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2854 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2855 NULL
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2856 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2857
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2858 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2859 "sar", "Saracen Paint (unpacked)", 0x7800, 10219, 0, DM_FMT_RDWR,
1772 5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	2860 fmtProbeSaracenPaint,
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2861 NULL, NULL,
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2862 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2863 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2864 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2865 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2866 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2867 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2868 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2869 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2870 { DO_COPY , DS_SCREEN_RAM , 0x7800 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2871 { DO_SET_MEM_LO , DS_BGCOL , 0x7bf0 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2872 { DO_COPY , DS_BITMAP_RAM , 0x7c00 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2873 { DO_COPY , DS_COLOR_RAM , 0x9c00 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2874 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2875 }
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2876 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2877 NULL
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2878 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2879
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2880 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2881 "blp", "Blazing Paddles (unpacked)", 0xA000, 10242, 0, DM_FMT_RDWR,
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2882 NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2883 NULL, NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2884 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2885 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2886 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2887 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2888 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2889 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2890 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2891 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2892 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
1980 2cf79254b8e4 Confirm the Blazing Paddles d020/bgcolor positions and remove the broken flag. Matti Hamalainen <ccr@tnsp.org> parents: 1979 diff changeset	2893 // Both d020 and bgcolor confirmed by tests
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2894 { DO_SET_MEM_LO , DS_D020 , 0x1f7f, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2895 { DO_SET_MEM_LO , DS_BGCOL , 0x1f80, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2896 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2897 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2898 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2899 }
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2900 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2901 NULL
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2902 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2903
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2904 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2905 "pmg", "Paint Magic crippled MC (unpacked)", 0x3f8e, 9332, 0, DM_FMT_RDWR,
1762 b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2906 NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2907 NULL, NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2908 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2909 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2910 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2911 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2912 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2913 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2914 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2915 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2916 { DO_COPY , DS_BITMAP_RAM , 0x4000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2917 { DO_COPY , DS_SCREEN_RAM , 0x6000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2918 { DO_SET_MEM_LO , DS_D020 , 0x5f40 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2919 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x5f43 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2920 { DO_SET_MEM_LO , DS_BGCOL , 0x5f44 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2921 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2922 }
1762 b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2923 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2924 NULL
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2925 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2926
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2927 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2928 "a64", "Wigmore Artist 64 (unpacked)", 0x4000, 10242, 0, DM_FMT_RDWR,
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2929 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2930 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2931 {
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2932 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2933 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2934 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2935 2, 1,
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2936 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2937 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2938 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2939 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2940 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2941 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2942 { DO_SET_MEM_LO , DS_D020 , 0x27fe, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2943 { DO_SET_MEM_LO , DS_BGCOL , 0x27ff, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2944 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2945 }
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2946 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2947 NULL
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2948 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2949
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2950 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2951 "ami", "Amica Paint (packed)", 0x4000, 0, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2952 fmtProbeAmicaPaintPacked,
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	2953 fmtDecodeAmicaPaintPacked, fmtEncodeAmicaPaintPacked,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2954 { 0 }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2955 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2956
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2957 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2958 "rpm", "Run Paint (unpacked)", 0x6000, 10006, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2959 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2960 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2961 { 0 }, &dmC64CommonFormats[0]
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2962 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2963
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2964 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2965 "ipc", "Interpaint MC (unpacked)", 0x4000, 10003, 0, DM_FMT_RDWR,
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2966 NULL,
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2967 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2968 { 0 }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2969 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2970
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2971 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2972 "art", "Art Studio (unpacked)", 0x2000, 9009, 0, DM_FMT_RDWR,
2161 6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	2973 fmtProbeArtStudio,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2974 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2975 { 0 }, &dmC64CommonFormats[2]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2976 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2977
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2978 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2979 "iph", "Interpaint (unpacked)", 0x4000, 9002, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2980 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2981 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2982 { 0 }, &dmC64CommonFormats[2]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2983 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2984
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2985 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2986 "dd", "Doodle (unpacked)", 0x1c00, 9218, 0, DM_FMT_RDWR,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2987 fmtProbeDoodle,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2988 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2989 { 0 }, &dmC64CommonFormats[10]
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2990 },
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2991
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2992 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	2993 "jj", "Doodle (packed)", 0x5c00, 0, 0xfe, DM_FMT_RDWR,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2994 fmtProbeDoodle,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2995 fmtDecodeStaticRLEMarkerMode2, fmtEncodeStaticRLEMarkerMode2,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	2996 { 0 }, &dmC64CommonFormats[10]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2997 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2998
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2999 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3000 "mon", "Monomagic (unpacked)", 0x2000, 8194, 0, DM_FMT_RDWR,
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3001 NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3002 NULL, NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3003 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3004 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3005 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3006 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3007 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3008 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3009 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3010 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3011 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3012 { DO_SET_OP , DS_SCREEN_RAM , 0xCF , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3013 // Default colors used by MM are --^^
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3014 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3015 }
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3016 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3017 NULL
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3018 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3019
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	3020 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3021 "hir", "Plain hires (unpacked)", 0x2000, 8002, 0, DM_FMT_RDWR,
1671 dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3022 NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3023 NULL, NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3024 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3025 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3026 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3027 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3028 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3029 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3030 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3031 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3032 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3033 { DO_SET_OP , DS_SCREEN_RAM , 0xF0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3034 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3035 }
1671 dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3036 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3037 NULL
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3038 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3039
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	3040 {
2613 b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3041 "hed", "Hi-Eddi (unpacked)", 0x2000, 9218, 0, DM_FMT_RDWR,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3042 NULL,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3043 NULL, NULL,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3044 {
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3045 D64_FMT_HIRES,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3046 D64_SCR_WIDTH , D64_SCR_HEIGHT,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3047 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3048 1, 1,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3049 NULL, NULL,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3050 NULL,
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3051 {
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3052 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3053 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3054 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3055 }
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3056 },
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3057 NULL
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3058 },
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3059
b814fe89038d Add support for Hi-Eddi hires format. Matti Hamalainen <ccr@tnsp.org> parents: 2607 diff changeset	3060 {
2537 646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3061 "gih", "Gigapaint hires [mono] (unpacked)", 0x6000, 8002, 0, DM_FMT_RDWR,
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3062 fmtProbeGigapaintHires,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3063 NULL, NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3064 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3065 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3066 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3067 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3068 1, 1,
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3069 NULL, NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3070 NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3071 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3072 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3073 { DO_SET_OP , DS_SCREEN_RAM , 0x0F , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3074 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3075 }
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3076 },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3077 NULL
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3078 },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3079
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	3080 {
2537 646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3081 "gic", "Gigapaint hires [color] (unpacked)", 0x6000, 9002, 0, DM_FMT_RDWR,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3082 fmtProbeGigapaintHires,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3083 NULL, NULL,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3084 {
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3085 D64_FMT_HIRES,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3086 D64_SCR_WIDTH , D64_SCR_HEIGHT,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3087 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3088 1, 1,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3089 NULL, NULL,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3090 NULL,
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3091 {
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3092 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3093 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3094 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3095 }
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3096 },
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3097 NULL
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3098 },
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3099
646641d72128 Add support for Giga-Paint hires format that includes screen RAM. Not sure Matti Hamalainen <ccr@tnsp.org> parents: 2535 diff changeset	3100 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3101 "bfli", "Pu-239 Big FLI/BFLI (unpacked)", 0x3bff, 33795, 0, DM_FMT_RD,
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	3102 NULL,
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	3103 NULL, NULL,
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	3104 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3105 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3106 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT * 2,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3107 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3108 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3109 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3110 fmtGetPixelBFLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3111 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3112 { DO_COPY , DS_COLOR_RAM , 0x0001, 0, 0x400 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3113 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x0401, 0, 0x400 , 0, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3114 { DO_COPY , DS_BITMAP_RAM , 0x2401, 0, 0x2000, 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3115 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x4401, 8, 0x400 , 0x400, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3116 { DO_COPY , DS_BITMAP_RAM , 0x6401, 1, 0x2000, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	3117 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3118 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3119 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	3120 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	3121 NULL
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	3122 },
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	3123
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	3124 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3125 "bml", "Black Mail FLI (unpacked)", 0x3b00, 17474, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3126 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3127 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3128 { 0 }, &dmC64CommonFormats[1]
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	3129 },
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	3130
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	3131 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3132 "bmlp", "Black Mail FLI (packed)", 0x38f0, 0, 0, DM_FMT_RDWR,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	3133 fmtProbeBlackMailFLIPacked,
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	3134 fmtDecodeBlackMailFLIPacked, fmtEncodeBlackMailFLIPacked,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3135 { 0 }, &dmC64CommonFormats[1]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3136 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3137
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3138 {
2614 c9741a11d1cd Format name consistency enforcement. Matti Hamalainen <ccr@tnsp.org> parents: 2613 diff changeset	3139 "dfed", "Dolphins FLI Editor 3.2 (unpacked)", 0x3b00, 17665, 0, DM_FMT_RDWR,
2308 28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	3140 NULL,
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	3141 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3142 { 0 }, &dmC64CommonFormats[1]
2308 28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	3143 },
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	3144
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	3145 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3146 "fd1", "FBI Crew FLI Designer 1.1 (unpacked)", 0x3c00, 17409, 0, DM_FMT_RDWR,
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	3147 NULL,
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	3148 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3149 { 0 }, &dmC64CommonFormats[9]
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	3150 },
69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	3151
69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	3152 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3153 "fd2", "FLI Designer 2 (unpacked)", 0x3ff0, 17409, 0, DM_FMT_RDWR,
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	3154 NULL,
69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	3155 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3156 { 0 }, &dmC64CommonFormats[9]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3157 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3158
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3159 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3160 "flnt", "Flinterlazer 1.0 (unpacked)", 0x284e, 38812, 0, DM_FMT_RD \| DM_FMT_BROKEN,
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3161 NULL,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3162 NULL, NULL,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3163 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3164 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3165 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3166 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3167 2, 1,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3168 NULL, NULL,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3169 fmtGetPixelFlinterlazer,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3170 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3171 { DO_COPY , DS_COLOR_RAM , 0x0000 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3172 { DO_COPY , DS_COLOR_RAM , 0x0000 , 1, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3173
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3174 { DO_COPY , DS_BITMAP_RAM , 0x4000 - 0x284e, 0, 0 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3175 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x6000 - 0x284e, 0, 0x400, 0, DF_NORMAL),
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3176
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3177 { DO_COPY , DS_BITMAP_RAM , 0x8000 - 0x284e, 1, 0 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3178 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0xA000 - 0x284e, 8, 0x400, 0, DF_NORMAL),
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3179
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3180 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_COLOR, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3181 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2582 880aa08c6aed Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2581 diff changeset	3182 { DO_FUNC , 0 , 0 , 0, 0, 0, fmtDecodeFlinterlazer, NULL, DF_NORMAL },
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3183 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3184 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3185 },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3186 NULL
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3187 },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3188
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	3189 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3190 "eci", "ECI Graphic Editor 1.0 (unpacked)", 0x4000, 32770, 0, DM_FMT_RDWR,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3191 NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3192 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3193 { 0 }, &dmC64CommonFormats[7]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3194 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3195
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3196 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3197 "ecip", "ECI Graphic Editor 1.0 (packed)", 0x4000, 0, 0, DM_FMT_RDWR,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3198 fmtProbeECIPacked,
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	3199 fmtDecodeECIPacked, fmtEncodeECIPacked,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3200 { 0 }, &dmC64CommonFormats[7]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3201 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3202
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3203 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3204 "fpt", "Face Painter (unpacked)", 0x4000, 10004, 0, DM_FMT_RDWR,
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3205 NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3206 NULL, NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3207 { // Almost same layout as Koala Painter, but FPT has D020
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3208 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3209 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3210 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3211 2, 1,
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3212 NULL, NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3213 NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3214 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3215 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3216 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3217 { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3218 { DO_SET_MEM_LO , DS_BGCOL , 0x2710, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3219 { DO_SET_MEM_LO , DS_D020 , 0x2711, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3220 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3221 }
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3222 },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3223 NULL
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3224 },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3225
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	3226 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3227 "fp2", "FunPaint II (unpacked)", 0x3ff0, 33694, 0, DM_FMT_RDWR,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	3228 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	3229 fmtDecodeFunPaint2, fmtEncodeFunPaint2Unpacked,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3230 { 0 }, &dmC64CommonFormats[3]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3231 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3232
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3233 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3234 "fp2p", "FunPaint II (packed)", 0x3ff0, 0, 0, DM_FMT_RDWR,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	3235 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	3236 fmtDecodeFunPaint2, fmtEncodeFunPaint2Packed,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3237 { 0 }, &dmC64CommonFormats[3]
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3238 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3239
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3240 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3241 "gun", "GunPaint 1.1 (unpacked)", 0x4000, 33603, 0, DM_FMT_RDWR,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3242 fmtProbeGunPaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3243 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3244 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3245 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3246 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3247 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3248 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3249 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	3250 fmtGetPixelFunPaint2, // The format is essentially same as FP2
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3251 {
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3252 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x0000, 0, 0x400, 0, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3253 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3254 { DO_COPY , DS_EXTRA_DATA , 0x3f4f, 0, 177, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3255 { DO_COPY , DS_COLOR_RAM , 0x4000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3256 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x4400, 8, 0x400, 0, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3257 { DO_COPY , DS_BITMAP_RAM , 0x6400, 1, 0 , 0, NULL, NULL, DF_NORMAL },
1847 e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	3258 // GunPaint does not store the last 3 d021 values .. so set them to black
e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	3259 // XXX TODO: According to some, the last 4 should be same ..
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3260 { DO_SET_MEM , DS_EXTRA_DATA , 0 , 0, 3 , 20+177, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	3261 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES , 0, 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	3262 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3263 { DO_FUNC , 0 , 0 , 0, 0 , 0, NULL, fmtEncodeGunPaint, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3264 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3265 }
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3266 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3267 NULL
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3268 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3269
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3270 {
2623 da81e524162e Rename a function and HCB format title to include BD (for Booze Design) Matti Hamalainen <ccr@tnsp.org> parents: 2620 diff changeset	3271 "hcb", "BD Half Char Bitmap (unpacked)", 0x5000, 12148, 0, DM_FMT_RDWR,
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3272 NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3273 NULL, NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3274 {
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3275 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3276 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3277 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3278 2, 1,
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3279 NULL, NULL,
2623 da81e524162e Rename a function and HCB format title to include BD (for Booze Design) Matti Hamalainen <ccr@tnsp.org> parents: 2620 diff changeset	3280 fmtGetPixelBDHCB,
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3281 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3282 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3283 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3284 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3285 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3286 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3287 { DO_COPY , DS_EXTRA_DATA , 0x2f40, 0, D64_SCR_HEIGHT / 4, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	3288 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3289 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3290 }
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3291 },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3292 NULL
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3293 },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3294
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	3295 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3296 "pen", "Pentel Paint (unpacked)", 0x4800, 19845, 0, DM_FMT_RD \| DM_FMT_BROKEN,
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3297 NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3298 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3299 {
2314 87533af8db64 Add format flag for formats that use sprite layer. Matti Hamalainen <ccr@tnsp.org> parents: 2313 diff changeset	3300 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_SPRITES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3301 192, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3302 24, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3303 2, 1,
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3304 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3305 fmtGetPixelPentelPaint,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	3306 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3307 { DO_COPY , DS_BITMAP_RAM , 0x0000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3308 { DO_SET_OP , DS_SCREEN_RAM , 0x10 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3309 { DO_SET_MEM_LO , DS_BGCOL , 0x9580 - 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3310 { DO_SET_MEM_LO , DS_D022 , 0x9581 - 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL }, // Sprite color
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3311 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x9582 - 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3312 { DO_COPY , DS_EXTRA_DATA , 0x5ac0 - 0x4800, 0, D64_SPR_SIZE * 235, 0, NULL, NULL, DF_NORMAL }, // Sprite data
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	3313 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3314 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3315 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3316 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3317 NULL
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3318 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3319
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3320 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3321 "chfd", "Crest Hires FLI Designer (unpacked)", 0x4000, 16386, 0, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3322 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3323 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3324 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3325 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3326 D64_SCR_WIDTH, D64_SCR_HEIGHT, // Actually 296 x 112 (=14*8)
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	3327 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	3328 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3329 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3330 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3331 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3332 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
2546 b76ac594cf33 Change DEF_REPEAT_BLOCK() macro to have operator argument. Matti Hamalainen <ccr@tnsp.org>* parents: 2545 diff changeset	3333 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x2000, 0, 0x400, 0, DF_NORMAL),
2545 e028058648ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2544 diff changeset	3334 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3335 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	3336 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	3337 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	3338 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3339 },
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	3340
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	3341 {
2614 c9741a11d1cd Format name consistency enforcement. Matti Hamalainen <ccr@tnsp.org> parents: 2613 diff changeset	3342 "cshf", "Crest Super Hires FLI Editor 1.0 (unpacked)", 0x4000, 15874, 0, DM_FMT_RDWR,
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	3343 fmtProbeCrestSHFLI,
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	3344 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3345 { 0 }, &dmC64CommonFormats[11]
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	3346 },
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	3347
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	3348 {
2614 c9741a11d1cd Format name consistency enforcement. Matti Hamalainen <ccr@tnsp.org> parents: 2613 diff changeset	3349 "cshfp", "Crest Super Hires FLI Editor 1.0 (packed)", 0xa000, 0, 0, DM_FMT_RD,
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	3350 fmtProbeCrestSHFLI,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	3351 fmtDecodeCrestSHFLIPacked, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3352 { 0 }, &dmC64CommonFormats[11]
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	3353 },
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	3354
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	3355 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3356 "cdhm", "Cosmos Designs Hires Manager (unpacked)", 0x4000, 16385, 0, DM_FMT_RDWR,
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	3357 fmtProbeCosmosDesignsHiresManager,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	3358 NULL, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3359 { 0 }, &dmC64CommonFormats[8]
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	3360 },
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	3361
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3362 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3363 "cdhp", "Cosmos Designs Hires Manager (packed)", 0x4000, 0, 0, DM_FMT_RD,
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	3364 fmtProbeCosmosDesignsHiresManager,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	3365 fmtDecodeCosmosDesignsHiresManagerPacked, NULL,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3366 { 0 }, &dmC64CommonFormats[8]
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	3367 },
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	3368
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	3369 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3370 "mrqp", "Marq's PETSCII editor (new format) (unpacked)", 0x0801, 0, 0, DM_FMT_RDWR,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3371 fmtProbeMarqPETSCII,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3372 NULL, NULL,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3373 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3374 D64_FMT_HIRES \| D64_FMT_CHAR,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3375 D64_SCR_WIDTH , D64_SCR_HEIGHT,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3376 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3377 1, 1,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3378 NULL, NULL,
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2170 diff changeset	3379 NULL,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3380 {
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	3381 // For offset values see petscii/m_c64.pde :: save_prg()
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	3382 { DO_FUNC , 0 , 20 - 2, 0, 0, 0, NULL, fmtEncodeMarqPETSCIIData, DF_NORMAL },
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	3383 { DO_COPY , DS_SCREEN_RAM , 0x60 , 0, 0, 0, NULL, NULL, DF_NORMAL },
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	3384 { DO_COPY , DS_COLOR_RAM , 0x60 + 1000,0,0, 0, NULL, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3385 { DO_SET_MEM_LO , DS_D020 , 25 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3386 { DO_SET_MEM_LO , DS_BGCOL , 30 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	3387 { DO_FUNC , 0 , 20 - 2, 0, 0, 0, fmtDecodeHiresPETSCIICharsetData, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3388
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3389 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3390 }
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3391 },
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3392 NULL
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	3393 },
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3394
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3395 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3396 "mqpo", "Marq's PETSCII editor (old format) (unpacked)", 0x0801, 2499, 0, DM_FMT_RD,
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3397 NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3398 NULL, NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3399 {
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3400 D64_FMT_HIRES \| D64_FMT_CHAR,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3401 D64_SCR_WIDTH , D64_SCR_HEIGHT,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3402 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3403 1, 1,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3404 NULL, NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3405 NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3406 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3407 { DO_COPY , DS_SCREEN_RAM , 0x01ab, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3408 { DO_COPY , DS_COLOR_RAM , 0x01ab + 1000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3409
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3410 { DO_SET_MEM_LO , DS_D020 , 0x01a9, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3411 { DO_SET_MEM_LO , DS_BGCOL , 0x01aa, 0, 0, 0, NULL, NULL, DF_NORMAL },
2377 d8889ff223b6 UPETSCII is actually old version of Marq's PETSCII editor. Matti Hamalainen <ccr@tnsp.org> parents: 2371 diff changeset	3412 { DO_FUNC , 0 , 0 , 0, 0, 0, fmtDecodeMarqOldData, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3413
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3414 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3415 }
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3416 },
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3417 NULL
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3418 },
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3419
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	3420 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3421 "pkhu", "petscii.krissz.hu editor (unpacked)", 0x0801, 0, 0, DM_FMT_RD,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3422 fmtProbePetsciiKrisszHu,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3423 NULL, NULL,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3424 {
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	3425 D64_FMT_CHAR,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3426 D64_SCR_WIDTH , D64_SCR_HEIGHT,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3427 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3428 1, 1,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3429 NULL, NULL,
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2170 diff changeset	3430 NULL,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3431 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3432 { DO_COPY , DS_SCREEN_RAM , 0x2001 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3433 { DO_COPY , DS_COLOR_RAM , 0x23e9 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3434
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3435 { DO_COPY , DS_EXTRA_DATA , 0x0000 , 0, 0x0100, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3436 { DO_COPY , DS_CHAR_DATA , 0x1801 - 2, 0, 0x0800, 0, NULL, NULL, DF_NORMAL },
2366 1e6e018b6487 Rename some functions to be more consistent with their intent. Matti Hamalainen <ccr@tnsp.org> parents: 2363 diff changeset	3437 { DO_FUNC , 0 , 0 , 0, 0 , 0, fmtDecodePetsciiKrisszHuData, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3438
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	3439 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3440 }
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3441 },
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3442 NULL
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	3443 },
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3444
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3445 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3446 "poca", "Petscii Coca editor (unpacked)", 0x0801, 0, 0, DM_FMT_RDWR,
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	3447 fmtProbeCocaPETSCII,
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3448 NULL, NULL,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3449 {
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3450 D64_FMT_HIRES \| D64_FMT_CHAR,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3451 D64_SCR_WIDTH , D64_SCR_HEIGHT,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3452 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3453 1, 1,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3454 NULL, NULL,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3455 NULL,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3456 {
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	3457 { DO_FUNC , 0 , 0x0c44 - 0x0801, 0, 0, 0, NULL, fmtEncodeCocaPETSCIIData, DF_NORMAL },
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3458 { DO_COPY , DS_SCREEN_RAM , 0x085a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3459 { DO_COPY , DS_COLOR_RAM , 0x0c5a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	3460
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3461 { DO_SET_MEM_LO , DS_D020 , 0x0c42 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3462 { DO_SET_MEM_LO , DS_BGCOL , 0x0c43 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	3463 { DO_FUNC , 0 , 0x0c44 - 0x0801, 0, 0, 0, fmtDecodeHiresPETSCIICharsetData, NULL, DF_NORMAL },
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3464
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3465 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3466 }
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3467 },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3468 NULL
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3469 },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	3470
2399 5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3471 {
2521 b19535da15e9 Add new field 'size_t extra' to DMC64ImageFormat for certain image format data Matti Hamalainen <ccr@tnsp.org> parents: 2519 diff changeset	3472 "acpe", "Abyss Connection PETSCII-Editor 4.61 (unpacked)", 0x3000, 2026, 0, DM_FMT_RDWR,
2399 5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3473 NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3474 NULL, NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3475 {
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3476 D64_FMT_HIRES \| D64_FMT_CHAR,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3477 D64_SCR_WIDTH , D64_SCR_HEIGHT,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3478 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3479 1, 1,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3480 NULL, NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3481 NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3482 {
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	3483 { DO_FUNC , 0 , 0x33ea - 0x3000, 0, 0, 0, NULL, fmtEncodeHiresPETSCIICharsetData, DF_NORMAL },
2399 5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3484 { DO_COPY , DS_SCREEN_RAM , 0x0000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3485 { DO_COPY , DS_COLOR_RAM , 0x0400 , 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3486
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3487 { DO_SET_MEM_LO , DS_D020 , 0x33e8 - 0x3000, 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3488 { DO_SET_MEM_LO , DS_BGCOL , 0x33e9 - 0x3000, 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3489 { DO_FUNC , 0 , 0x33ea - 0x3000, 0, 0, 0, fmtDecodeHiresPETSCIICharsetData, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3490
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3491 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3492 }
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3493 },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3494 NULL
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3495 },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	3496
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3497 {
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	3498 "suphi1", "SupeRes hires [clear] (packed)", -1, 0, 0x23, DM_FMT_RDWR,
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3499 fmtProbeSupeRes,
2545 e028058648ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2544 diff changeset	3500 fmtDecodeSupeRes, fmtEncodeSupeRes,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3501 { 0 }, &dmC64CommonFormats[10]
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3502 },
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3503
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3504 {
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	3505 "suphi2", "SupeRes hires [no-clear] (packed)", -1, 0, 0x25, DM_FMT_RDWR,
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3506 fmtProbeSupeRes,
2545 e028058648ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2544 diff changeset	3507 fmtDecodeSupeRes, fmtEncodeSupeRes,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3508 { 0 }, &dmC64CommonFormats[10]
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3509 },
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3510
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3511 {
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	3512 "supmc1", "SupeRes multicolor [clear] (packed)", -1, 0, 0x24, DM_FMT_RDWR,
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3513 fmtProbeSupeRes,
2545 e028058648ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2544 diff changeset	3514 fmtDecodeSupeRes, fmtEncodeSupeRes,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3515 { 0 }, &dmC64CommonFormats[0]
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3516 },
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3517
4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3518 {
2525 19b0ca169361 Implement SupeRes encoding. Matti Hamalainen <ccr@tnsp.org> parents: 2524 diff changeset	3519 "supmc2", "SupeRes multicolor [no-clear] (packed)", -1, 0, 0x26, DM_FMT_RDWR,
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3520 fmtProbeSupeRes,
2545 e028058648ea Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2544 diff changeset	3521 fmtDecodeSupeRes, fmtEncodeSupeRes,
2573 21d296803fac Use { 0 } initializer instead of {}. Matti Hamalainen <ccr@tnsp.org> parents: 2570 diff changeset	3522 { 0 }, &dmC64CommonFormats[0]
2519 4dbb6572622d Add preliminary decoder for SupeRes hires and multicolor files. The decoder Matti Hamalainen <ccr@tnsp.org> parents: 2428 diff changeset	3523 },
2540 a60e046b7294 Add read-only support for another unknown unpacked c64 MC format (contains a viewer routine). Matti Hamalainen <ccr@tnsp.org> parents: 2539 diff changeset	3524
2570 1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3525 {
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3526 "vhi", "EXON VHI Editor 0.1 (unpacked)", 0x2000, 17389, 0, DM_FMT_RDWR,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3527 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3528 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3529 { 0 }, &dmC64CommonFormats[12]
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3530 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3531
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3532 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3533 "vhip", "EXON VHI Editor 0.1 (packed)", 0x2000, 17389, 0, DM_FMT_RD,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3534 fmtProbeEXON_VHI_Packed,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3535 fmtDecodeEXON_VHI_Packed, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3536 { 0 }, &dmC64CommonFormats[12]
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3537 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3538
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3539 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3540 "xx1", "Unknown $2000 format (unpacked)", 0x2000, 10242, 0, DM_FMT_RDWR,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3541 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3542 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3543 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3544 D64_FMT_MC,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3545 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3546 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3547 2, 1,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3548 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3549 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3550 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3551 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3552 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3553 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3554 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3555 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3556 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3557 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3558 NULL
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3559 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3560
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3561 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3562 "xx2", "Unknown $2000 format (unpacked)", 0x2000, 0, 0, DM_FMT_RDWR,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3563 fmtProbeFormatXX2,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3564 fmtDecodeFormatXX2, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3565 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3566 D64_FMT_MC,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3567 XX2_WIDTH_CH * 4, XX2_HEIGHT_CH * 8,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3568 XX2_WIDTH_CH , XX2_HEIGHT_CH,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3569 2, 1,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3570 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3571 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3572 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3573 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, XX2_BSIZE, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3574 { DO_COPY , DS_SCREEN_RAM , XX2_BSIZE, 0, XX2_SIZE, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3575 { DO_COPY , DS_COLOR_RAM , XX2_BSIZE + XX2_SIZE, 0, XX2_SIZE, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3576 { DO_SET_OP , DS_BGCOL , 11 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3577 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3578 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3579 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3580 NULL
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3581 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3582
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3583 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3584 "xx3", "Unknown $0801 format (viewer) (unpacked)", 0x0801, 10500, 0, DM_FMT_RD,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3585 fmtProbeFormatXX3,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3586 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3587 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3588 D64_FMT_MC,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3589 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3590 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3591 2, 1,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3592 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3593 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3594 {
2628 00b21276f2c0 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2627 diff changeset	3595 { DO_SET_MEM_LO , DS_D020 , 0x09e6 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
00b21276f2c0 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 2627 diff changeset	3596 { DO_SET_MEM_LO , DS_BGCOL , 0x09e7 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3597 { DO_COPY , DS_BITMAP_RAM , 0x09f2 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3598 { DO_COPY , DS_SCREEN_RAM , 0x2932 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3599 { DO_COPY , DS_COLOR_RAM , 0x2d1a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3600 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3601 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3602 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3603 NULL
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3604 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3605
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3606 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3607 "xx4", "Unknown $1f00 format (unpacked)", 0x1f00, 10260, 0, DM_FMT_RD,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3608 fmtProbeFormatXX4,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3609 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3610 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3611 D64_FMT_MC,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3612 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3613 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3614 2, 1,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3615 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3616 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3617 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3618 { DO_COPY , DS_BITMAP_RAM , 0x2000 - 0x1f00, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3619 { DO_COPY , DS_SCREEN_RAM , 0x3f40 - 0x1f00, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3620 { DO_COPY , DS_COLOR_RAM , 0x4328 - 0x1f00, 0, 0, 0, NULL, NULL, DF_NORMAL },
2626 4fc62ffe1969 Fix XX4 bg/border color setting. Matti Hamalainen <ccr@tnsp.org> parents: 2625 diff changeset	3621 { DO_SET_MEM_LO, DS_BGCOL , 0x4710 - 0x1f00, 0, 0, 0, NULL, NULL, DF_NORMAL },
4fc62ffe1969 Fix XX4 bg/border color setting. Matti Hamalainen <ccr@tnsp.org> parents: 2625 diff changeset	3622 { DO_SET_MEM_LO, DS_D020 , 0x4711 - 0x1f00, 0, 0, 0, NULL, NULL, DF_NORMAL },
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3623 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3624 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3625 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3626 NULL
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3627 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3628
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3629 {
2570 1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3630 "xx5", "Unknown $1000 format (unpacked)", 0x1000, 45000, 0, DM_FMT_RD \| DM_FMT_BROKEN,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3631 fmtProbeFormatXX5,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3632 NULL, NULL,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3633 {
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3634 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_ILACE,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3635 D64_SCR_WIDTH , D64_SCR_HEIGHT,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3636 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3637 1, 1,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3638 NULL, NULL,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3639 fmtGetPixelXX5,
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3640 {
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3641 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x4000 - 0x1000, 0, 0x400, 0, DF_NORMAL),
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3642 DEF_REPEAT_BLOCK_8(DO_COPY, DS_SCREEN_RAM , 0x8000 - 0x1000, 8, 0x400, 0, DF_NORMAL),
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3643
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3644 { DO_COPY , DS_BITMAP_RAM , 0x6000 - 0x1000, 0, 0, 0, NULL, NULL, DF_NORMAL },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3645 { DO_COPY , DS_BITMAP_RAM , 0xa400 - 0x1000, 1, 0, 0, NULL, NULL, DF_NORMAL },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3646
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3647 { DO_COPY , DS_COLOR_RAM , 0x8000 - 0x1000, 0, 0, 0, NULL, NULL, DF_NORMAL },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3648
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3649 // BG/FG always 0
2625 84d6b7805b7f Fix XX5 bg/border color setting. Matti Hamalainen <ccr@tnsp.org> parents: 2624 diff changeset	3650 { DO_SET_OP , DS_BGCOL , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
84d6b7805b7f Fix XX5 bg/border color setting. Matti Hamalainen <ccr@tnsp.org> parents: 2624 diff changeset	3651 { DO_SET_OP , DS_D020 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2570 1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3652
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3653 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES , 0, 0, D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3654 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3655 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3656 }
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3657 },
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3658 NULL
1559011d749f Add preliminary support for "Unknown $1000 format (unpacked)" as "xx5". Matti Hamalainen <ccr@tnsp.org> parents: 2546 diff changeset	3659 },
2540 a60e046b7294 Add read-only support for another unknown unpacked c64 MC format (contains a viewer routine). Matti Hamalainen <ccr@tnsp.org> parents: 2539 diff changeset	3660
2603 8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	3661 {
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3662 "xx6", "Unknown $0801 format (viewer) (unpacked)", 0x0801, 16148, 0, DM_FMT_RD,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3663 fmtProbeFormatXX6,
2603 8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	3664 NULL, NULL,
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3665 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3666 D64_FMT_MC,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3667 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3668 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3669 2, 1,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3670 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3671 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3672 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3673 { DO_COPY , DS_BITMAP_RAM , 0x2000 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3674 { DO_COPY , DS_SCREEN_RAM , 0x3f40 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3675 { DO_COPY , DS_COLOR_RAM , 0x4328 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3676 { DO_SET_OP , DS_D020 , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3677 { DO_SET_MEM_LO , DS_BGCOL , 0x4710 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3678 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3679 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3680 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3681 NULL
2603 8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	3682 },
8386c5e55a31 Implement support for EXON VHI Editor 0.1 unpacked format files Matti Hamalainen <ccr@tnsp.org> parents: 2601 diff changeset	3683
2605 f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	3684 {
2620 2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3685 "xx7", "Unknown $0801 format (viewer) (unpacked)", 0x0801, 9590, 0, DM_FMT_RD,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3686 fmtProbeFormatXX7,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3687 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3688 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3689 D64_FMT_HIRES,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3690 D64_SCR_WIDTH , D64_SCR_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3691 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3692 1, 1,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3693 NULL, NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3694 NULL,
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3695 {
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3696 { DO_COPY , DS_BITMAP_RAM , 0x0a26 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3697 { DO_COPY , DS_SCREEN_RAM , 0x2968 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3698 { DO_SET_MEM_LO , DS_D020 , 0x2966 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3699 { DO_SET_MEM_LO , DS_BGCOL , 0x2967 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3700 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3701 }
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3702 },
2aa885371c13 Reorganize the format list a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2614 diff changeset	3703 NULL
2605 f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	3704 },
f5f03c5d9fd5 Implement EXON VHI Editor 0.1 packed format support. Matti Hamalainen <ccr@tnsp.org> parents: 2604 diff changeset	3705
2627 262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3706 {
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3707 "xx9", "Unknown $0801 format (viewer) (unpacked)", 0x0801, 10608, 0, DM_FMT_RD,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3708 fmtProbeFormatXX9,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3709 NULL, NULL,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3710 {
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3711 D64_FMT_MC,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3712 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3713 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3714 2, 1,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3715 NULL, NULL,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3716 NULL,
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3717 {
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3718 { DO_COPY , DS_BITMAP_RAM , 0x0a38 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3719 { DO_COPY , DS_SCREEN_RAM , 0x297a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3720 { DO_COPY , DS_COLOR_RAM , 0x2d62 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3721 { DO_SET_MEM_LO, DS_BGCOL , 0x2979 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3722 { DO_SET_MEM_LO, DS_D020 , 0x2978 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3723 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3724 }
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3725 },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3726 NULL
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3727 },
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3728
262395b86b7c Add support for unknown plain multicolor viewer format XX9. Matti Hamalainen <ccr@tnsp.org> parents: 2626 diff changeset	3729
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3730 };
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3731
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3732 const int ndmC64ImageFormats = sizeof(dmC64ImageFormats) / sizeof(dmC64ImageFormats[0]);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3733

Mercurial > hg > dmlib

annotate tools/lib64fmts.c @ 2628:00b21276f2c0