dmlib: tools/lib64fmts.c annotate

annotate tools/lib64fmts.c @ 1860:01d7feb9f9ce

Some work on Pentel Paint sprite layer support. Does not work very well yet.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 24 Jun 2018 05:46:12 +0300
parents	5d9dd663df8d
children	752893fa6412

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
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 * (C) Copyright 2012-2018 Tecnic Software productions (TNSP)
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
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	13 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	14 {
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	15 // 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	16 if (buf->len > 30 &&
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	17 buf->len != 10006 &&
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	18 buf->len != 10003 &&
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	19 dmCompareAddr16(buf, 0, fmt->addr))
1771 c261db6e39aa Adjust some probe scores. Matti Hamalainen <ccr@tnsp.org> parents: 1770 diff changeset	20 return DM_PROBE_SCORE_GOOD;
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	21
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	22 return DM_PROBE_SCORE_FALSE;
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	23 }
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	24
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	25
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	26 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	27 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	28 if (buf->len > 32 &&
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	29 (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	30 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	31 // Packed variant
1841 fc4841460fad Attempt to avoid misprobes of "Rainbow Painter (unpacked)" as packed Doodle files. Matti Hamalainen <ccr@tnsp.org> parents: 1840 diff changeset	32 if (fmt->size == 0xfe &&
fc4841460fad Attempt to avoid misprobes of "Rainbow Painter (unpacked)" as packed Doodle files. Matti Hamalainen <ccr@tnsp.org> parents: 1840 diff changeset	33 buf->len != fmt->size &&
fc4841460fad Attempt to avoid misprobes of "Rainbow Painter (unpacked)" as packed Doodle files. Matti Hamalainen <ccr@tnsp.org> parents: 1840 diff changeset	34 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	35 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	36
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	37 // Unpacked variant
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	38 if (fmt->size != 0xfe && buf->len == fmt->size)
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	39 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	40 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	41
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	42 return DM_PROBE_SCORE_FALSE;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	43 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	44
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	45
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	46 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	47 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	48 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	49 DMGrowBuf mem;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	50 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	51
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	52 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	53 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	54 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_2;
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	55 cfg.rleMarkerB = fmt->size;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	56
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	57 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	58 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	59
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	60 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	61
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	62 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	63 dmGrowBufFree(&mem);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	64 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	65 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	66
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	67
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	68 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	69 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	70 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	71 DMGrowBuf tmp;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	72 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	73
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	74 // Encode the data to temp buffer
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	75 if ((res = dmC64EncodeGenericBMP(TRUE, &tmp, img, fmt)) != DMERR_OK)
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	76 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	77
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	78 // 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	79 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	80 cfg.type = DM_COMP_RLE_MARKER;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	81 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_2;
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	82 cfg.rleMarkerB = fmt->size;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	83 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	84 cfg.rleMaxCountB = 255;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	85 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	86
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	87 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	88 dmGrowBufFree(&tmp);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	89 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	90 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	91
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	92
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	93 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	94 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	95 const Uint8 *ident = buf->data + 2;
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	96 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	97 dmCompareAddr16(buf, 0, fmt->addr) &&
1662 34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	98 memcmp(ident, "DRAZPAINT ", 10) == 0 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 ident[11] == '.' && (
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 (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	101 (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	102 ))
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 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	104
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	109 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	110 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	112 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	113 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114
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	115 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	116 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	117 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	118 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	119
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	120 if ((res = dmDecodeGenericRLEAlloc(&mem,
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	121 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	122 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	124 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	125
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 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	133 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 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	136 DMCompParams cfg;
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	137 const char *magicID = (fmt->format->type & 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	138
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 // Encode the data to temp buffer
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 if ((res = dmC64EncodeGenericBMP(TRUE, &tmp, img, fmt)) != DMERR_OK)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142
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	143 // 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	144 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	145 cfg.type = DM_COMP_RLE_MARKER;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	146 cfg.flags = DM_RLE_BYTE_RUNS \| DM_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	147 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	148 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	150 dmGenericRLEAnalyze(&tmp, &cfg);
1661 dc3fbd130db7 RLE analyze was ran before setting up the compression config. Oops. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	151
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 // 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	153 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	154 !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	155 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 // 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	161 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	162
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	169 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	170 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	171 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	172 dmCompareAddr16(buf, 0, fmt->addr) &&
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	173 memcmp(buf->data + 2, "DRAZLACE! 1.0", 13) == 0)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 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	175
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
1529 4068d87ca884 Rename some decoder functions. Matti Hamalainen <ccr@tnsp.org> parents: 1505 diff changeset	180 static BOOL fmtDrazLaceGetLaceType(DMC64Image img, const DMC64EncDecOp op,
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	181 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	182 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 (void) fmt;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	184 img->laceType = buf->data[op->offs] ? D64_ILACE_RES : D64_ILACE_COLOR;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 return TRUE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	189 static BOOL fmtDrazLaceSetLaceType(const DMC64EncDecOp op, DMGrowBuf buf,
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	190 const DMC64Image img, const DMC64ImageFormat fmt)
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	191 {
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	192 (void) fmt;
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	193 buf->data[op->offs] = (img->laceType == D64_ILACE_RES) ? 1 : 0;
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	194 return TRUE;
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	195 }
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	196
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	197
1662 34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	198 static const char *fmtBDP5MagicID = "BDP 5.00";
34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	199
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	200 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	201 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	202 if (buf->len > 20 &&
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	203 dmCompareAddr16(buf, 0, fmt->addr) &&
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	204 memcmp(buf->data + 2, fmtBDP5MagicID, strlen(fmtBDP5MagicID)) == 0)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	205 return DM_PROBE_SCORE_MAX;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	206
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	207 return DM_PROBE_SCORE_FALSE;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	208 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	209
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	210
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	211 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	212 {
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	213 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	214 DMGrowBuf mem, tmp;
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	215 DMCompParams cfg;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	216
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	217 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	218 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	219 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_WORD_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	220 cfg.rleMarkerB = buf->data[8];
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	221 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	222
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	223 // 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	224 // 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	225 // 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	226 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	227 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	228
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	229 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	230
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	231 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	232 goto out;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	233
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	234 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	235
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	236 out:
1792 905c09049fe6 Oops, forgot to free the buffer allocated in the BDP5 decoder. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1791 diff changeset	237 dmGrowBufFree(&tmp);
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	238 dmGrowBufFree(&mem);
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	239 return res;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	240 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	241
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	242
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	243 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	244 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	245 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	246 DMGrowBuf mem;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	247 DMCompParams cfg;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	248
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	249 // Encode the data to temp buffer
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	250 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	251 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	252
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	253 // 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	254 cfg.func = fmt->name;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	255 cfg.type = DM_COMP_RLE_MARKER;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	256 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_WORD_RUNS \| DM_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	257 cfg.rleMinCountB = 4;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	258 cfg.rleMaxCountB = 255;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	259 cfg.rleMinCountW = 256;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	260 cfg.rleMaxCountW = 1024;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	261
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	262 dmGenericRLEAnalyze(&mem, &cfg);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	263
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	264 // 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	265 if (!dmGrowBufPut(buf, (Uint8 *) fmtBDP5MagicID, strlen(fmtBDP5MagicID)) \|\|
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	266 !dmGrowBufPutU8(buf, cfg.rleMarkerB) \|\|
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	267 !dmGrowBufPutU8(buf, cfg.rleMarkerW))
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	268 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	269 res = DMERR_MALLOC;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	270 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	271 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	272
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	273 // 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	274 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	275
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	276 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	277 dmGrowBufFree(&mem);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	278 return res;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	279 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	280
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	281
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	282 static const char *fmtGunPaintMagicID = "GUNPAINT (JZ) ";
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	283 #define fmtGunPaintMagicLen (14)
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	284 #define fmtGunPaintMagicOffs (0x3e8)
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	285
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	286 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	287 {
1845 a77451bb6614 Improve GunPaint format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1844 diff changeset	288 if (buf->len > fmtGunPaintMagicOffs + fmtGunPaintMagicLen &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 dmCompareAddr16(buf, 0, fmt->addr) &&
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	290 memcmp(buf->data + fmtGunPaintMagicOffs + 2, fmtGunPaintMagicID, fmtGunPaintMagicLen) == 0)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 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	292
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	297 static BOOL fmtEncodeGunPaint(const DMC64EncDecOp op, DMGrowBuf buf,
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	298 const DMC64Image img, const DMC64ImageFormat fmt)
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	299 {
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	300 (void) op;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	301 (void) img;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	302 (void) fmt;
1848 273e274f9ed6 Fix encoding of GunPaint format by placing the magic ID in correct position. Matti Hamalainen <ccr@tnsp.org> parents: 1847 diff changeset	303 memcpy(buf->data + fmtGunPaintMagicOffs + 2, fmtGunPaintMagicID, fmtGunPaintMagicLen);
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	304 return TRUE;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	305 }
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	306
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	307
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	308 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	309 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 size_t i, n;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	312 if (buf->len < 256 \|\| !dmCompareAddr16(buf, 0, fmt->addr))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 // 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	316 // as do some GunPaint images ..
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	317 if (buf->len == 9002 \|\|
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	318 fmtProbeGunPaint(buf, fmt) > DM_PROBE_SCORE_GOOD)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	321 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	322 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	323
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 if (n > 50)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 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	326 if (n > 25)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 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	328 if (n > 10)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 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	330
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	335 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	336 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 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	339 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341 // 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	342 // 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	343 if (dmGrowBufCopy(&tmp, buf, 1) == NULL)
768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	344 return DMERR_MALLOC;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345
1751 768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	346 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	347
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 // 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	349 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	350 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	351 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	352 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	353
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	354 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	355 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 // 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	358 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	359
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	367 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	368 {
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	369 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	370 DMGrowBuf mem;
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	371 DMCompParams cfg;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	372
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	373 // Encode the data to temp buffer
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	374 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	375 goto out;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	376
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	377 // 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	378 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	379 cfg.type = DM_COMP_RLE_MARKER;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	380 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	381 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	382 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	383 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	384
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	385 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	386
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	387 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	388 dmGrowBufFree(&mem);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	389 return res;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	390 }
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	391
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	392
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	393 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	394 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	395 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	396 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	397 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	398
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	399 return DM_PROBE_SCORE_FALSE;
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	400 }
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	401
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	402
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	403 static Uint8 fmtGetPixelFLIDesigner(
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	404 const DMC64Image *img, const int bmoffs, const int scroffs,
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	405 const int shift, const int bitmap, const int rasterX, const int rasterY)
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	406 {
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	407 (void) rasterX;
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	408 return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shift, rasterY & 7, bitmap, 0, img->bgcolor);
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	409 }
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	410
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	411
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	412 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	413 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	414 if (buf->len > 16 &&
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	415 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	416 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	417 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	418 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	419
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	420 return DM_PROBE_SCORE_FALSE;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	421 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	422
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	423
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	424 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	425 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	426 int res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	427 DMGrowBuf dst, src;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	428 DMCompParams cfg;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	429
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	430 cfg.func = fmt->name;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	431 cfg.type = DM_COMP_RLE_MARKER;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	432 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1 \| DM_RLE_ZERO_COUNT_MAX \|
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	433 DM_RLE_BACKWARDS_INPUT \| DM_RLE_BACKWARDS_OUTPUT \| DM_OUT_CROP_END;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	434 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	435 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	436
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	437 // 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	438 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	439
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	440 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	441 goto out;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	442
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	443 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	444
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	445 out:
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	446 dmGrowBufFree(&dst);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	447 return res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	448 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	449
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	450
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	451 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	452 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	453 int res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	454 DMGrowBuf tmp1, tmp2;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	455 DMCompParams cfg;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	456
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	457 dmGrowBufInit(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	458 dmGrowBufInit(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	459
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	460 // Encode the data to temp buffer
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	461 if ((res = dmC64EncodeGenericBMP(TRUE, &tmp1, img, fmt)) != DMERR_OK)
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	462 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	463
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	464 // 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	465 cfg.func = fmt->name;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	466 cfg.type = DM_COMP_RLE_MARKER;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	467 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1 \| DM_RLE_ZERO_COUNT_MAX \|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	468 DM_RLE_BACKWARDS_INPUT \| DM_RLE_BACKWARDS_OUTPUT;
1855 5e33f367bafe Adjust the minimum byte run RLE counts from 3 to 4. Matti Hamalainen <ccr@tnsp.org> parents: 1854 diff changeset	469 cfg.rleMinCountB = 4;
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	470 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	471
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	472 dmGenericRLEAnalyze(&tmp1, &cfg);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	473
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	474 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	475 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	476
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	477 // 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	478 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	479 !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	480 !dmGrowBufPutU16LE(buf, 0x7f3f) \|\|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	481 !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	482 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	483 res = DMERR_MALLOC;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	484 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	485 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	486
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	487 out:
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	488 dmGrowBufFree(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	489 dmGrowBufFree(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	490 return res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	491 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	492
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	493
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	494 static Uint8 fmtGetPixelBlackMailFLI(
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	495 const DMC64Image *img, const int bmoffs, const int scroffs,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	496 const int shift, const int bitmap, const int rasterX, const int rasterY)
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	497 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	498 const int vbank = rasterY & 7;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	499 (void) rasterX;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	500
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	501 return dmC64GetGenericMCPixel(
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	502 img, bmoffs, scroffs, shift,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	503 vbank, bitmap, 0,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	504 img->extraData[0].data[rasterY] & 15);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	505 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	506
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	507
1529 4068d87ca884 Rename some decoder functions. Matti Hamalainen <ccr@tnsp.org> parents: 1505 diff changeset	508 static BOOL fmtTruePaintGetLaceType(DMC64Image img, const DMC64EncDecOp op,
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	509 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	510 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 (void) op;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 (void) buf;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 (void) fmt;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 img->laceType = D64_ILACE_RES;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 return TRUE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 static Uint8 fmtGetPixelTruePaint(
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 const DMC64Image *img, const int bmoffs, const int scroffs,
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	521 const int shift, const int bitmap, 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	522 {
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	523 (void) rasterX;
52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	524 (void) rasterY;
52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	525 return dmC64GetGenericMCPixel(img, bmoffs, scroffs, shift, 0, bitmap, 0, img->bgcolor);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	529 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	530 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	531 // 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	532 // relocation of decompression code
1684 e7990551c6d6 Rename function variable. Matti Hamalainen <ccr@tnsp.org> parents: 1671 diff changeset	533 static const Uint8 magicID[] = {
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	534 0x0b, 0x08, 0x09, 0x00, 0x9e, 0x32, 0x30, 0x35,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	535 0x39, 0x00, 0xa2, 0x00, 0x78, 0xbd, 0x1c, 0x08,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	536 0x9d, 0xf5, 0x00, 0xe8, 0xd0, 0xf7, 0xe6, 0x01,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	537 0x4c, 0x01, 0x01, 0xa5, 0xfe, 0xd0, 0x02, 0xc6,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	538 0xff, 0xc6, 0xfe
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	539 };
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	540
1789 9f5c5ab0e85e Adjust True Paint probing to be slightly more forgiving vs. file size. Matti Hamalainen <ccr@tnsp.org> parents: 1788 diff changeset	541 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	542 dmCompareAddr16(buf, 0, fmt->addr) &&
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	543 memcmp(buf->data + 2, magicID, sizeof(magicID)) == 0)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	544 return DM_PROBE_SCORE_MAX;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	545
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	546 return DM_PROBE_SCORE_FALSE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	547 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	548
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	549
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	550 //
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	551 // 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	552 // 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	553 // simplistic "codebook".
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	554 //
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	555 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	556 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	557 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	558 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	559 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	560 "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	561 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	562 else
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	563 return DMERR_OK;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	564 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	565
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	566
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	567 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	568 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	569 int res = DMERR_OK;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	570 const Uint8 codeBook1, codeBook2;
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	571 DMGrowBuf dst, src;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	572 DMCompParams cfg;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	573 Uint8 data;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	574
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	575 // 1b7e-67e8 decoded by original depacker
12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	576 // 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	577 cfg.func = fmt->name;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	578 cfg.type = DM_COMP_RLE_MARKER;
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	579 cfg.flags = DM_RLE_BACKWARDS_OUTPUT \| DM_RLE_BACKWARDS_INPUT \| DM_OUT_CROP_END;
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	580 cfg.rleMarkerB = 0xfe;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	581 cfg.cropOutLen = 0x67e8 - 0x1c00;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	582
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	583 // 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	584 codeBook1 = psrc->data + 0x81 - 2;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	585 codeBook2 = psrc->data + 0x85 - 2;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	586
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	587 // Allocate output buffer
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	588 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	589 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	590
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	591 // 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	592 // 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	593 dmGrowBufConstCopy(&src, psrc);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	594 dmSetupRLEBuffers(&dst, &src, &cfg);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	595
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	596 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	597 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	598 unsigned int count = 1;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	599 BOOL found = FALSE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	600
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	601 for (int n = 0; n < 8; n++)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	602 if (codeBook1[n] == data && !found)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	603 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	604 found = TRUE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	605 switch (n)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	606 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	607 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	608 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	609 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	610
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	611 count = data;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	612 if (data == 0)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	613 goto finish;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	614
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	615 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	616
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	617 case 1: // Y = 1, JTO = $17
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	618 count += 2;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	619 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	620
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	621 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	622 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	623 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	624 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	625
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	626 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	627 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	628 goto out;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	629
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	630 count = data;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	631 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	632
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	633 case 3: // Y = 3, JTO = $0B
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	634 count += 2;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	635 data = 0;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	636 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	637
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	638 default: // Y = [5..8], JTO = $00
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	639 count++;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	640 data = codeBook2[n];
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	641 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	642 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	643 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	644
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	645 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	646 goto out;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	647 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	648
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	649 finish:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	650 dmFinishRLEBuffers(&dst, &src, &cfg);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	651 res = dmC64DecodeGenericBMP(img, &dst, fmt);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	652
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	653 out:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	654 dmGrowBufFree(&dst);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	655 return res;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	656 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	657
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	658
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	659 #define XX2_MIN_SIZE 4000
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	660 #define XX2_WIDTH_CH 40
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	661 #define XX2_HEIGHT_CH 10
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	662 #define XX2_SIZE (XX2_WIDTH_CH * XX2_HEIGHT_CH)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	663 #define XX2_BSIZE (XX2_SIZE * 8)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	664
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	666 static int fmtProbeFormatXX2(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	667 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	668 if (buf->len >= XX2_MIN_SIZE &&
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	669 buf->len <= XX2_MIN_SIZE + 8 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670 dmCompareAddr16(buf, 0, fmt->addr))
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 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	672
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 return DM_PROBE_SCORE_FALSE;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	677 static int fmtDecodeFormatXX2(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	678 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	680 DMGrowBuf tmp;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 // If there is only data for less than XX2_MIN_SIZE bytes,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 // allocate a buffer of that size and copy data there.
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 // Otherwise allocate len bytes.
1748 9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	685 if (dmGrowBufCopy(&tmp, buf, buf->len < XX2_MIN_SIZE ? XX2_MIN_SIZE - buf->len : 0) == NULL)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
1748 9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	688 tmp.len = tmp.size;
9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	689 res = dmC64DecodeGenericBMP(img, &tmp, fmt);
9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	690 dmGrowBufFree(&tmp);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	695 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	696 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	697 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	698 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	699 // Packed variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	700 if (fmt->size == 0 &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	701 dmCompareAddr16(buf, 2, fmt->addr + buf->len - 3) &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	702 dmCompareAddr16(buf, 4, 0x7ff2))
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	703 return DM_PROBE_SCORE_MAX;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	704
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	705 // Unpacked variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	706 if (fmt->size != 0 && fmt->size == buf->len)
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	707 return DM_PROBE_SCORE_GOOD;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	708 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	709
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	710 return DM_PROBE_SCORE_FALSE;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	711 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	712
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	713
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	714 #define FUNPAINT2_HEADER_SIZE (0x10)
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	715 static const char *fmtFunPaint2MagicID = "FUNPAINT (MT) ";
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	718 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	719 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	720 if (buf->len > 30 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 dmCompareAddr16(buf, 0, fmt->addr) &&
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	722 memcmp(buf->data + 2, fmtFunPaint2MagicID, strlen(fmtFunPaint2MagicID)) == 0)
1777 a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	723 {
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	724 // Unpacked variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	725 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	726 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	727
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	728 // Packed variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	729 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	730 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	731 }
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	732
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	733 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	734 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	737 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	738 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	739 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	740 DMGrowBuf tmp;
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	741
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	742 // 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	743 if (buf->data[14])
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	744 {
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	745 DMGrowBuf mem;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	746 DMCompParams cfg;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	747
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	748 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	749 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	750 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	751 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	752
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	753 dmGrowBufCopyOffs(&tmp, buf, FUNPAINT2_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	754 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	755
1598 b5e0f28f1842 Adjust Fun Paint 2 decoding now that the RLE decoding is fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1594 diff changeset	756 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	757 &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	758 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	759
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	760 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	761 dmGrowBufFree(&tmp);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	762 }
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	763 else
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	764 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	765 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCopyOffs(&tmp, buf, FUNPAINT2_HEADER_SIZE), fmt);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	766 }
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	772 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	773 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 // Add the header bits
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	775 if (!dmGrowBufPut(buf, (Uint8 *) fmtFunPaint2MagicID, strlen(fmtFunPaint2MagicID)) \|\|
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	776 !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	777 !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	778 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 return dmC64EncodeGenericBMP(FALSE, buf, img, fmt);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	784 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	785 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	787 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	788 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	790 // Encode the data to temp buffer
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	791 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	792 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793
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	794 // 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	795 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	796 cfg.type = DM_COMP_RLE_MARKER;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	797 cfg.flags = DM_RLE_BYTE_RUNS \| DM_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	798 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	799 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	801 dmGenericRLEAnalyze(&mem, &cfg);
1661 dc3fbd130db7 RLE analyze was ran before setting up the compression config. Oops. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	802
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 // Add the header bits
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	804 if (!dmGrowBufPut(buf, (Uint8 *) fmtFunPaint2MagicID, strlen(fmtFunPaint2MagicID)) \|\|
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	805 !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	806 !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	807 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 // 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	813 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	814
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	816 dmGrowBufFree(&mem);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	820
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	821 static Uint8 fmtGetPixelFunPaint2(
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822 const DMC64Image *img, const int bmoffs, const int scroffs,
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	823 const int shift, const int bitmap, 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	824 {
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	825 const int vbank = (rasterY & 7) + (bitmap * 8);
52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	826 (void) rasterX;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827
1577 632f1dbc83eb Get rid of some code duplication by merging functionality of certain pixel Matti Hamalainen <ccr@tnsp.org> parents: 1575 diff changeset	828 return dmC64GetGenericMCPixel(
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	829 img, bmoffs, scroffs, shift,
52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	830 vbank, bitmap, 0,
1847 e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	831 img->extraData[0].data[rasterY] & 15);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	835 static Uint8 fmtGetPixelBFLI(
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	836 const DMC64Image *img, const int bmoffs, const int scroffs,
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	837 const int shift, const int bitmap, 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	838 {
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	839 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	840 const int vbank = (rasterY & 7) + (vbb * 8);
1756 1a121154f41f Silence a warning about unused function argument. Matti Hamalainen <ccr@tnsp.org> parents: 1755 diff changeset	841 (void) bitmap;
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	842 (void) rasterX;
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	843
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	844 return dmC64GetGenericMCPixel(
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	845 img, bmoffs & 0x1fff, scroffs & 0x3ff,
5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	846 shift, vbank, 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	847 }
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	848
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	849
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	850 static Uint8 fmtGetPixelPentelPaint(
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	851 const DMC64Image *img, const int bmoffs, const int scroffs,
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	852 const int shift, const int bitmap, 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	853 {
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	854 const int ry = rasterY / C64_SPR_HEIGHT_PX;
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	855 const int yd = rasterY % C64_SPR_HEIGHT_PX;
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	856 const int rx = rasterX / C64_SPR_WIDTH_PX;
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	857 const int xd = rasterX % C64_SPR_WIDTH_PX;
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	858 const int offs = (ry * 8 + rx) * C64_SPR_SIZE + (yd * C64_SPR_WIDTH_UT) + (xd / 8);
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	859 const int mask = 1 << (7 - (rasterX & 7));
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	860
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	861 Uint8 color1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, 0, bitmap, 0);
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	862 Uint8 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0;
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	863 Uint8 color3 = img->extraData[0].data[offs + C64_SPR_SIZE * 155] & mask ? img->d022 : 0;
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	864
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	865 return color3 ? color3 : ( color2 ? color2 : color1 );
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868
1752 fe3ae3fdf0f3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 1751 diff changeset	869 static Uint8 fmtGetPixelCrestHIFLIorCDHM(
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	870 const DMC64Image *img, const int bmoffs, const int scroffs,
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	871 const int shift, const int bitmap, 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	872 {
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	873 (void) rasterX;
1766 13e5c212eb2b Clean up fmtGetPixelCrestHIFLIorCDHM(). Matti Hamalainen <ccr@tnsp.org> parents: 1765 diff changeset	874 return dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, rasterY & 7, bitmap, 0);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	875 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	876
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	877
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	878 static BOOL fmtECIGetLaceType(DMC64Image img, const DMC64EncDecOp op,
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	879 const DMGrowBuf buf, const DMC64ImageFormat fmt)
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	880 {
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	881 (void) op;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	882 (void) buf;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	883 (void) fmt;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	884 img->laceType = D64_ILACE_COLOR;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	885 return TRUE;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	886 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	887
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	888
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	889 static Uint8 fmtGetPixelECI(
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	890 const DMC64Image *img, const int bmoffs, const int scroffs,
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	891 const int shift, const int bitmap, 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	892 {
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	893 const int vbank = rasterY & 7;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	894 Uint8
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	895 c1 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, vbank , 0, 0),
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	896 c2 = dmC64GetGenericSCPixel(img, bmoffs, scroffs, shift, vbank + 8, 1, 0);
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	897
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	898 (void) bitmap;
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	899 (void) rasterX;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	900 return (c1 * C64_NCOLORS) + c2;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	901 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	902
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	903
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	904 static int fmtConvertECIBMP2Image(DMImage dst, const DMC64Image src, const DMC64ImageFormat *fmt)
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	905 {
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	906 if (!dmSetMixedColorC64Palette(dst))
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	907 return DMERR_MALLOC;
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	908
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	909 return dmC64ConvertGenericBMP2Image(dst, src, fmt);
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	910 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	911
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	912
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	913 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	914 {
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	915 size_t i, n;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	916
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	917 // XXX TODO: Perhaps count statistics about used byte values
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	918 // and compare to value in buf[2] which is the RLE marker
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	919 if (buf->len < 128 \|\|
1753 09641e7179f6 Attempt to avoid misprobes of some Crest Hires FLI designer files as ECI 1.0 files. Matti Hamalainen <ccr@tnsp.org> parents: 1752 diff changeset	920 !dmCompareAddr16(buf, 0, fmt->addr) \|\|
1760 c944844e437f Improve fmtProbeECIPacked() probing. Matti Hamalainen <ccr@tnsp.org> parents: 1759 diff changeset	921 // Try to avoid misprobe of Crest Hires FLI Designer and Cosmos Design format
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	922 buf->len == 16386 \|\| buf->len == 16385)
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	923 return DM_PROBE_SCORE_FALSE;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	924
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	925 for (n = 0, i = 3; i < buf->len; i++)
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	926 if (buf->data[i] == buf->data[2]) n++;
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	927
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	928 if (n > 50)
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	929 return DM_PROBE_SCORE_GOOD;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	930 if (n > 25)
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	931 return DM_PROBE_SCORE_AVG;
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	932 if (n > 10)
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	933 return DM_PROBE_SCORE_MAYBE;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	934
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	935 return DM_PROBE_SCORE_FALSE;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	936 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	937
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	938
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	939 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	940 {
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	941 int res;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	942 DMGrowBuf tmp;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	943 DMGrowBuf mem;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	944 DMCompParams cfg;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	945
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	946 cfg.func = fmt->name;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	947 cfg.type = DM_COMP_RLE_MARKER;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	948 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	949 cfg.rleMarkerB = buf->data[0];
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	950
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	951 if ((res = dmDecodeGenericRLEAlloc(
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	952 &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	953 res = dmC64DecodeGenericBMP(img, &mem, fmt);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	954
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	955 dmGrowBufFree(&mem);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	956 return res;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	957 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	958
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	959
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 //
1795 c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	961 // Helper macros for defining screen memory layouts
c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	962 // 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	963 //
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	964 #define DEF_SCREEN_RAM(start, oindex, bindex, osize, bsize) { DO_COPY, DS_SCREEN_RAM, (start) + ((osize) * (oindex)), (bindex), (bsize), 0, NULL, NULL }
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	965 #define DEF_SCREEN_RAMS_8(start, sindex, osize, bsize) \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	966 DEF_SCREEN_RAM((start), 0, (sindex + 0), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	967 DEF_SCREEN_RAM((start), 1, (sindex + 1), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	968 DEF_SCREEN_RAM((start), 2, (sindex + 2), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	969 DEF_SCREEN_RAM((start), 3, (sindex + 3), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	970 DEF_SCREEN_RAM((start), 4, (sindex + 4), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	971 DEF_SCREEN_RAM((start), 5, (sindex + 5), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	972 DEF_SCREEN_RAM((start), 6, (sindex + 6), (osize), (bsize)), \
37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	973 DEF_SCREEN_RAM((start), 7, (sindex + 7), (osize), (bsize))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	974
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	976
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	977 //
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	978 // Many formats actually share memory layout, and there are packed and
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	979 // unpacked versions of several formats. We'll reuse these here through
1795 c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	980 // 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	981 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	982 DMC64ImageCommonFormat dmC64CommonFormats[] =
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	983 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	984 { // #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	985 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	986 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	987 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	988 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	989 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	990 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	991 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	992 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	993 { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	994 { DO_SET_MEM_LO , DS_BGCOL , 0x2710, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	995 { DO_LAST , 0 , 0 , 0, 0, 0, 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	996 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	997 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	998
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	999 { // #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	1000 D64_FMT_MC \| D64_FMT_FLI,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1001 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1002 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1003 NULL, NULL,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1004 fmtGetPixelBlackMailFLI,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1005 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1006 { DO_COPY , DS_EXTRA_DATA , 0x0000, 0, 200, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1007 { DO_COPY , DS_COLOR_RAM , 0x0100, 0, 0, 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1008 DEF_SCREEN_RAMS_8(0x0500, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1009 { DO_COPY , DS_BITMAP_RAM , 0x2500, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1010 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1011 }
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1012 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1013
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1014 { // #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	1015 D64_FMT_HIRES,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1016 C64_SCR_WIDTH , C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1017 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1018 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1019 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1020 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1021 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1022 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1023 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1024 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1025 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1026
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1027 { // #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	1028 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1029 C64_SCR_WIDTH, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1030 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1031 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1032 fmtGetPixelFunPaint2,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1033 {
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1034 DEF_SCREEN_RAMS_8(0x0000, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1035 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0, 0 , 0, NULL, NULL },
1854 31c9884321b1 Fix Fun Paint 2 raster colours. Matti Hamalainen <ccr@tnsp.org> parents: 1850 diff changeset	1036 { DO_COPY , DS_EXTRA_DATA , 0x3f48, 0, 100, 0, NULL, NULL },
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1037 { DO_COPY , DS_COLOR_RAM , 0x4000, 0, 0 , 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1038 DEF_SCREEN_RAMS_8(0x43e8, 8, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1039 { DO_COPY , DS_BITMAP_RAM , 0x63e8, 1, 0 , 0, NULL, NULL },
1847 e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	1040 { DO_COPY , DS_EXTRA_DATA , 0x8328, 0, 100, 100, NULL, NULL },
1854 31c9884321b1 Fix Fun Paint 2 raster colours. Matti Hamalainen <ccr@tnsp.org> parents: 1850 diff changeset	1041 { DO_DEC_FUNC , 0 , 0 , 0, 1 , 0, fmtTruePaintGetLaceType, NULL },
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1042 { DO_LAST , 0 , 0 , 0, 0 , 0, 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	1043 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1044 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1045
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1046 { // #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	1047 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1048 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1049 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1050 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1051 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1052 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1053 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1054 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1055 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1056 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1057 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1058 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1059 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1060
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1061 { // #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	1062 D64_FMT_MC \| D64_FMT_ILACE,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1063 C64_SCR_WIDTH , C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1064 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1065 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1066 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1067 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1068 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1069 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1070 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1071 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1072 { DO_COPY , DS_BITMAP_RAM , 0x2800, 1, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1073 { DO_DEC_FUNC , 0 , 0x2742, 0, 1, 0, fmtDrazLaceGetLaceType, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1074 { DO_ENC_FUNC , 0 , 0x2742, 0, 1, 0, NULL, fmtDrazLaceSetLaceType },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1075 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1076 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1077 },
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1078
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1079 { // #6: TruePaint
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1080 D64_FMT_MC \| D64_FMT_ILACE,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1081 C64_SCR_WIDTH , C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1082 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1083 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1084 fmtGetPixelTruePaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1085 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1086 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1087 { DO_SET_MEM_LO , DS_BGCOL , 0x03e8, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1088 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1089 { DO_COPY , DS_BITMAP_RAM , 0x2400, 1, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1090 { DO_COPY , DS_SCREEN_RAM , 0x4400, 1, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1091 { DO_COPY , DS_COLOR_RAM , 0x4800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1092 { DO_DEC_FUNC , 0 , 0x0000, 0, 0, 0, fmtTruePaintGetLaceType, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1093 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1094 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1095 },
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1096
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1097 { // #7: ECI Graphic Editor Hires FLI
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1098 D64_FMT_HIRES \| D64_FMT_FLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1099 C64_SCR_WIDTH, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1100 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1101 fmtConvertECIBMP2Image, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1102 fmtGetPixelECI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1103 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1104 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1105 DEF_SCREEN_RAMS_8(0x2000, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1106 { DO_COPY , DS_BITMAP_RAM , 0x4000, 1, 0, 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1107 DEF_SCREEN_RAMS_8(0x6000, 8, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1108 { DO_DEC_FUNC , 0 , 0 , 0, 0, 0, fmtECIGetLaceType, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1109 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1110 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1111 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1112
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1113 { // #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	1114 D64_FMT_HIRES \| D64_FMT_FLI,
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1115 C64_SCR_WIDTH, 248, // Actually 296 x 192 (=248)
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1116 C64_SCR_CH_WIDTH, 24,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1117 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1118 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1119 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1120 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1121 DEF_SCREEN_RAMS_8(0x2000, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1122 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1123 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1124 },
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	1125
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	1126 { // #9: FLI Designer 1.x & 2.0
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	1127 D64_FMT_MC \| D64_FMT_FLI,
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	1128 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
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	1129 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
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	1130 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	1131 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	1132 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1133 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1134 DEF_SCREEN_RAMS_8(0x0400, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1135 { DO_COPY , DS_BITMAP_RAM , 0x2400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1136 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
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	1137 }
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	1138 },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1139
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1140 { // #10: Doodle
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1141 D64_FMT_HIRES,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1142 C64_SCR_WIDTH , C64_SCR_HEIGHT,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1143 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1144 NULL, NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1145 NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1146 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1147 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1148 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1149 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1150 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1151 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1152 };
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1153
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1154
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1155 //
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1156 // 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	1157 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1158 DMC64ImageFormat dmC64ImageFormats[] =
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1159 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1161 "d2p", "DrazPaint 1.4/2.0 (packed)", 0x5800, 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	1162 fmtProbeDrazPaint20Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1163 fmtDecodeDrazPaintPacked, fmtEncodeDrazPaintPacked,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1164 { }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1165 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1166
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1167 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1168 "drp", "DrazPaint (unpacked)", 0x5800, 10051, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1169 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1170 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	1171 { }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1172 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1173
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1174 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1175 "dlp", "DrazLace 1.0 (packed)", 0x5800, 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	1176 fmtProbeDrazLace10Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1177 fmtDecodeDrazPaintPacked, fmtEncodeDrazPaintPacked,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1178 { }, &dmC64CommonFormats[5]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1179 },
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 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1182 "drl", "DrazLace 1.0 (unpacked)", 0x5800, 18242, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1183 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1184 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	1185 { }, &dmC64CommonFormats[5]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1186 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1187
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1188 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1189 "bdp5", "Boogie Down Paint 5 (packed)", 0x5000, 0, DM_FMT_RDWR,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1190 fmtProbeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1191 fmtDecodeBDP5Packed, fmtEncodeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1192 { }, &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	1193 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1194
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1195 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1196 "vid", "Vidcom 64 (unpacked)", 0x5800, 10050, DM_FMT_RDWR,
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1197 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1198 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1199 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1200 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1201 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1202 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1203 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1204 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1205 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1206 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1207 { DO_SET_MEM_LO , DS_BGCOL , 0x07e8, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1208 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1209 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1210 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1211 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1212 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1213 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1214 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1215
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1216 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1217 "p64", "Picasso 64 (unpacked)", 0x1800, 10050, DM_FMT_RDWR,
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1218 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1219 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1220 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1221 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1222 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1223 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1224 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1225 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1226 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1227 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1228 { DO_SET_MEM_LO , DS_BGCOL , 0x07fe, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1229 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1230 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1231 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1232 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1233 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1234 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1235 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1236
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1237 {
1816 8d7b424197bc Allow writing of unpacked True Paint format. Matti Hamalainen <ccr@tnsp.org> parents: 1815 diff changeset	1238 "mci", "Truepaint (unpacked)", 0x9c00, 19434, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240 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	1241 { }, &dmC64CommonFormats[6]
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1242 },
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1243
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1244 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1245 "mcip", "Truepaint (packed)", 0x0801, 0, DM_FMT_RD,
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1246 fmtProbeTruePaintPacked,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1247 fmtDecodeTruePaintPacked, NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1248 { }, &dmC64CommonFormats[6]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1249 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1250
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1251 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	1252 "kla", "Koala Painter (unpacked)", 0x6000, 10003, 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	1253 NULL,
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1254 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	1255 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1258 {
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	1259 "klp", "Koala Painter (packed)", 0x6000, 0xfe, DM_FMT_RDWR, // size is abused for RLE marker byte
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	1260 fmtProbeKoalaPainterPacked,
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	1261 fmtDecodeStaticRLEMarkerMode2, fmtEncodeStaticRLEMarkerMode2,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1262 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1264
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1265 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1266 "aas", "Advanced Art Studio (unpacked)", 0x2000, 10018, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1267 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1268 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1269 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1270 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1271 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1272 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1273 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1274 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1275 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1276 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1277 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1278 { DO_SET_MEM_LO , DS_D020 , 0x2328, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1279 { DO_SET_MEM_LO , DS_BGCOL , 0x2329, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1280 { DO_COPY , DS_COLOR_RAM , 0x2338, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1281 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1282 },
1593 a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	1283 },
a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	1284 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1285 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1286
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1287 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1288 "ims", "Image System MC (unpacked)", 0x3c00, 10218, DM_FMT_RDWR,
1755 841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1289 NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1290 NULL, NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1291 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1292 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1293 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1294 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1295 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1296 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1297 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1298 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1299 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1300 { DO_SET_MEM_LO , DS_BGCOL , 0x23ff, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1301 { DO_COPY , DS_SCREEN_RAM , 0x2400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1302 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1303 }
1755 841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1304 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1305 NULL
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1306 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1307
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1308 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1309 "mil", "MIL (unpacked)", 0x18dc, 10022, DM_FMT_RDWR \| DM_FMT_BROKEN,
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1310 NULL,
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1311 NULL, NULL,
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1312 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1313 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1314 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1315 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1316 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1317 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1318 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1319 { DO_COPY , DS_SCREEN_RAM , 20 + 0 , 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1320 { DO_COPY , DS_COLOR_RAM , 20 + 1000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1321 { DO_COPY , DS_BITMAP_RAM , 20 + 2000, 0, 0, 0, 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	1322 // XXX TODO: Unknown where the background color is set, so default to 0x01
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1323 //{ DO_SET_MEM , DS_BGCOL , 0x23ff, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1324 { DO_SET_OP , DS_BGCOL , 0x01 , 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1325 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1326 }
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1327 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1328 NULL
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1329 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1330
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1331 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1332 "cdu", "CDU-Paint (unpacked)", 0x7eef, 10277, DM_FMT_RDWR,
1754 aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1333 NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1334 NULL, NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1335 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1336 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1337 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1338 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1339 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1340 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1341 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1342 { DO_COPY , DS_BITMAP_RAM , 0x0000 + 0x111, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1343 { DO_COPY , DS_SCREEN_RAM , 0x1f40 + 0x111, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1344 { DO_COPY , DS_COLOR_RAM , 0x2328 + 0x111, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1345 { DO_SET_MEM_LO , DS_BGCOL , 0x2710 + 0x111, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1346 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1347 }
1754 aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1348 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1349 NULL
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1350 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1351
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1352 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1353 "rbp", "Rainbow Painter (unpacked)", 0x5c00, 10242, DM_FMT_RDWR \| DM_FMT_BROKEN,
1763 847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1354 NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1355 NULL, NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1356 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1357 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1358 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1359 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1360 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1361 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1362 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1363 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1364 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1365 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, 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	1366 // XXX TODO: Not sure if the background color is hardcoded ..
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1367 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1368 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1369 }
1763 847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1370 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1371 NULL
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1372 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1373
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1374 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1375 "sar", "Saracen Paint (unpacked)", 0x7800, 10219, 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	1376 fmtProbeSaracenPaint,
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1377 NULL, NULL,
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1378 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1379 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1380 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1381 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1382 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1383 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1384 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1385 { DO_COPY , DS_SCREEN_RAM , 0x7800 - 0x7800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1386 { DO_SET_MEM_LO , DS_BGCOL , 0x7bf0 - 0x7800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1387 { DO_COPY , DS_BITMAP_RAM , 0x7c00 - 0x7800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1388 { DO_COPY , DS_COLOR_RAM , 0x9c00 - 0x7800, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1389 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1390 }
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1391 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1392 NULL
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1393 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1394
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1395 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1396 "blp", "Blazing Paddles (unpacked)", 0xA000, 10242, DM_FMT_RDWR \| DM_FMT_BROKEN,
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1397 NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1398 NULL, NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1399 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1400 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1401 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1402 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1403 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1404 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1405 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1406 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, 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	1407 // XXX TODO: Background color is wrong, this offset/addr is from codebase64 docs
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1408 { DO_SET_MEM_LO , DS_D020 , 0x1f7f, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1409 { DO_SET_MEM_LO , DS_BGCOL , 0x1f80, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1410 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1411 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1412 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1413 }
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1414 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1415 NULL
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1416 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1417
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1418 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1419 "pmg", "Paint Magic crippled MC (unpacked)", 0x3f8e, 9332, 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	1420 NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1421 NULL, NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1422 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1423 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1424 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1425 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1426 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1427 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1428 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1429 { DO_COPY , DS_BITMAP_RAM , 0x4000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1430 { DO_COPY , DS_SCREEN_RAM , 0x6000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1431 { DO_SET_MEM_LO , DS_D020 , 0x5f40 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1432 { DO_SET_MEM , DS_COLOR_RAM , 0x5f43 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1433 { DO_SET_MEM_LO , DS_BGCOL , 0x5f44 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1434 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1435 }
1762 b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1436 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1437 NULL
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1438 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1439
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1440 {
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1441 "a64", "Wigmore Artist 64 (unpacked)", 0x4000, 10242, DM_FMT_RDWR,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1442 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1443 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1444 {
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1445 D64_FMT_MC,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1446 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1447 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1448 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1449 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1450 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1451 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1452 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1453 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1454 { DO_SET_MEM_LO , DS_D020 , 0x27fe, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1455 { DO_SET_MEM_LO , DS_BGCOL , 0x27ff, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1456 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1457 }
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1458 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1459 NULL
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1460 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1461
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1462 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1463 "ami", "Amica Paint (packed)", 0x4000, 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	1464 fmtProbeAmicaPaintPacked,
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1465 fmtDecodeAmicaPaintPacked, fmtEncodeAmicaPaintPacked,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1466 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1467 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1468
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1469 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1470 "rpm", "Run Paint (unpacked)", 0x6000, 10006, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1471 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1472 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	1473 { }, &dmC64CommonFormats[0]
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1474 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1475
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1476 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1477 "ipc", "Interpaint MC (unpacked)", 0x4000, 10003, 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	1478 NULL,
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1479 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	1480 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1481 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1482
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1483 {
1819 c12bd223000e Enable write support for some formats that should be workable. Matti Hamalainen <ccr@tnsp.org> parents: 1816 diff changeset	1484 "art", "Art Studio (unpacked)", 0x2000, 9009, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1485 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1486 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	1487 { }, &dmC64CommonFormats[2]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1488 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1489
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1490 {
1819 c12bd223000e Enable write support for some formats that should be workable. Matti Hamalainen <ccr@tnsp.org> parents: 1816 diff changeset	1491 "iph", "Interpaint (unpacked)", 0x4000, 9002, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1492 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1493 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1494 { }, &dmC64CommonFormats[2]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1495 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1496
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1497 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1498 "dd", "Doodle (unpacked)", 0x1c00, 9218, DM_FMT_RDWR,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1499 fmtProbeDoodle,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1500 NULL, NULL,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1501 { }, &dmC64CommonFormats[10]
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1502 },
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1503
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1504 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1505 "jj", "Doodle (packed)", 0x5c00, 0xfe, DM_FMT_RDWR, // size is abused for RLE marker byte
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1506 fmtProbeDoodle,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1507 fmtDecodeStaticRLEMarkerMode2, fmtEncodeStaticRLEMarkerMode2,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1508 { }, &dmC64CommonFormats[10]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1509 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1510
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1511 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1512 "mon", "Monomagic (unpacked)", 0x2000, 8194, DM_FMT_RDWR,
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1513 NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1514 NULL, NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1515 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1516 D64_FMT_HIRES,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1517 C64_SCR_WIDTH , C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1518 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1519 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1520 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1521 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1522 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1523 { DO_SET_OP , DS_SCREEN_RAM , 0xCF , 0, 0, 0, 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	1524 // Default colors used by MM are --^^
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1525 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1526 }
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1527 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1528 NULL
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1529 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1530
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1531 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1532 "hir", "Plain hires (unpacked)", 0x2000, 8002, DM_FMT_RDWR,
1671 dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1533 NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1534 NULL, NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1535 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1536 D64_FMT_HIRES,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1537 C64_SCR_WIDTH , C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1538 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1539 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1540 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1541 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1542 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1543 { DO_SET_OP , DS_SCREEN_RAM , 0xF0 , 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1544 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1545 }
1671 dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1546 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1547 NULL
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1548 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1549
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1550 {
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1551 "bfli", "Pu-239 Big FLI/BFLI (unpacked)", 0x3bff, 33795, 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	1552 NULL,
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1553 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	1554 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1555 D64_FMT_MC \| D64_FMT_FLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1556 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT * 2,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1557 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1558 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1559 fmtGetPixelBFLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1560 {
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1561 { DO_COPY , DS_COLOR_RAM , 0x0001, 0, 0x400 , 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1562 DEF_SCREEN_RAMS_8(0x0401, 0, 0x400, 0),
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1563 { DO_COPY , DS_BITMAP_RAM , 0x2401, 0, 0x2000, 0, NULL, NULL },
5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1564 DEF_SCREEN_RAMS_8(0x4401, 8, 0x400, 0x400),
5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1565 { DO_COPY , DS_BITMAP_RAM , 0x6401, 1, 0x2000, 0, NULL, NULL },
5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1566 { DO_LAST , 0 , 0 , 0, 0 , 0, 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	1567 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1568 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1569 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	1570 },
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1571
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1572 {
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1573 "bml", "Black Mail FLI (unpacked)", 0x3b00, 17474, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1574 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1575 NULL, NULL,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1576 { }, &dmC64CommonFormats[1]
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1577 },
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1578
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1579 {
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1580 "bmlp", "Black Mail FLI (packed)", 0x38f0, 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	1581 fmtProbeBlackMailFLIPacked,
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	1582 fmtDecodeBlackMailFLIPacked, fmtEncodeBlackMailFLIPacked,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1583 { }, &dmC64CommonFormats[1]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1584 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1585
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1586 {
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	1587 "fd2", "FBI Crew FLI Designer 1.1 (unpacked)", 0x3c00, 17409, DM_FMT_RDWR,
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	1588 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	1589 NULL, NULL,
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	1590 { }, &dmC64CommonFormats[9]
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	1591 },
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	1592
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	1593 {
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	1594 "fli", "FLI Designer 2 (unpacked)", 0x3ff0, 17409, DM_FMT_RDWR,
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	1595 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	1596 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	1597 { }, &dmC64CommonFormats[9]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1598 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1599
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1600 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1601 "eci", "ECI Graphic Editor 1.0 (unpacked)", 0x4000, 32770, DM_FMT_RDWR,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1602 NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1603 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	1604 { }, &dmC64CommonFormats[7]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1605 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1606
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1607 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1608 "ecp", "ECI Graphic Editor 1.0 (packed)", 0x4000, 0, DM_FMT_RD,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1609 fmtProbeECIPacked,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1610 fmtDecodeECIPacked, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1611 { }, &dmC64CommonFormats[7]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1612 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1613
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1614 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1615 "xx1", "Unknown $2000 format (unpacked)", 0x2000, 10242, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1616 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1617 NULL, NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1618 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1619 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1620 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1621 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1622 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1623 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1624 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1625 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1626 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1627 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1628 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1629 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1630 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1631 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1632 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1633 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1634
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1635 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1636 "xx2", "Unknown $2000 format (unpacked)", 0x2000, 0, DM_FMT_RDWR,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1637 fmtProbeFormatXX2,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1638 fmtDecodeFormatXX2, NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1639 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1640 D64_FMT_MC,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1641 XX2_WIDTH_CH * 4, XX2_HEIGHT_CH * 8,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1642 XX2_WIDTH_CH , XX2_HEIGHT_CH,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1643 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1644 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1645 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1646 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, XX2_BSIZE, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1647 { DO_COPY , DS_SCREEN_RAM , XX2_BSIZE, 0, XX2_SIZE, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1648 { DO_COPY , DS_COLOR_RAM , XX2_BSIZE + XX2_SIZE, 0, XX2_SIZE, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1649 { DO_SET_OP , DS_BGCOL , 11 , 0, 0, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1650 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1651 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1652 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1653 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1654 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1655
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1656 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1657 "fp2", "FunPaint II (unpacked)", 0x3ff0, 33694, DM_FMT_RDWR,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1658 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1659 fmtDecodeFunPaint2, fmtEncodeFunPaint2Unpacked,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1660 { }, &dmC64CommonFormats[3]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1661 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1662
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1663 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1664 "fp2p", "FunPaint II (packed)", 0x3ff0, 0, DM_FMT_RDWR,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1665 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1666 fmtDecodeFunPaint2, fmtEncodeFunPaint2Packed,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1667 { }, &dmC64CommonFormats[3]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1668 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1669
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1670 {
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1671 "gun", "GunPaint (unpacked)", 0x4000, 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	1672 fmtProbeGunPaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1673 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1674 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1675 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1676 C64_SCR_WIDTH, C64_SCR_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1677 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1678 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1679 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	1680 {
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1681 DEF_SCREEN_RAMS_8(0x0000, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1682 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0, 0 , 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1683 { DO_COPY , DS_EXTRA_DATA , 0x3f4f, 0, 177, 0, NULL, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1684 { DO_COPY , DS_COLOR_RAM , 0x4000, 0, 0 , 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1685 DEF_SCREEN_RAMS_8(0x4400, 8, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1686 { DO_COPY , DS_BITMAP_RAM , 0x6400, 1, 0 , 0, NULL, NULL },
1847 e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	1687 // 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	1688 // XXX TODO: According to some, the last 4 should be same ..
e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	1689 { DO_SET_MEM , DS_EXTRA_DATA , 0 , 0, 3 , 20+177, NULL, NULL },
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1690 { DO_DEC_FUNC , 0 , 0x2742, 0, 1 , 0, fmtTruePaintGetLaceType, NULL },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1691 { DO_ENC_FUNC , 0 , fmtGunPaintMagicOffs, 0, fmtGunPaintMagicLen, 0, NULL, fmtEncodeGunPaint },
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1692 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL },
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1693 }
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1694 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1695 NULL
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1696 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1697
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1698 {
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	1699 "pen", "Pentel Paint (unpacked)", 0x4800, 19845, DM_FMT_RD \| DM_FMT_BROKEN,
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1700 NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1701 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1702 {
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1703 D64_FMT_HIRES \| D64_FMT_FLI,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1704 192, C64_SCR_HEIGHT,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1705 24, C64_SCR_CH_HEIGHT,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1706 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1707 fmtGetPixelPentelPaint,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	1708 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1709 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
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	1710 { DO_SET_OP , DS_SCREEN_RAM , 0x10 , 0, 0, 0, NULL, NULL },
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1711 { DO_SET_MEM_LO , DS_BGCOL , 0x9580 - 0x4800, 0, 0, 0, NULL, NULL },
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	1712 { DO_SET_MEM_LO , DS_D022 , 0x9581 - 0x4800, 0, 0, 0, NULL, NULL }, // Sprite color
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	1713 { DO_SET_MEM , DS_COLOR_RAM , 0x9582 - 0x4800, 0, 0, 0, NULL, NULL },
01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	1714 { DO_COPY , DS_EXTRA_DATA , 0x5ac0 - 0x4800, 0, C64_SPR_SIZE * 235, 0, NULL, NULL }, // Sprite data
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1715 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1716 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1717 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1718 NULL
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1719 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1720
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1721 {
1802 e42fa7da7b55 Rename Crest Hires Designer short ID. Matti Hamalainen <ccr@tnsp.org> parents: 1798 diff changeset	1722 "chid", "Crest Hires FLI Designer (unpacked)", 0x4000, 16386, DM_FMT_RD,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1723 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1724 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1725 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1726 D64_FMT_HIRES \| D64_FMT_FLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1727 C64_SCR_WIDTH, C64_SCR_HEIGHT, // Actually 296 x 112 (=14*8)
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1728 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1729 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1730 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1731 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1732 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1856 37cac290ce8b Allow override of block size in DEF_SCREEN_RAMS_8() and DEF_SCREEN_RAM() macros. Matti Hamalainen <ccr@tnsp.org> parents: 1855 diff changeset	1733 DEF_SCREEN_RAMS_8(0x2000, 0, 0x400, 0),
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1734 { DO_LAST , 0 , 0 , 0, 0, 0, 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	1735 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1736 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1737 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1738 },
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1739
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1740 {
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1741 "cdhm", "Cosmos Designs Hires Manager (unpacked)", 0x4000, 16385, DM_FMT_RD,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1742 fmtProbeCosmosDesignsHiresManager,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1743 NULL, NULL,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1744 { }, &dmC64CommonFormats[8]
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	1745 },
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1746 };
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 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	1749

Mercurial > hg > dmlib

annotate tools/lib64fmts.c @ 1860:01d7feb9f9ce