dmlib: tools/lib64fmts.c annotate

annotate tools/lib64fmts.c @ 2149:810fc98d9003

Cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 02 Jun 2019 23:37:35 +0300
parents	009ee261704c
children	b4fbb90937f7

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
2120 88d37ec1b4d6 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 2114 diff changeset	5 * (C) Copyright 2012-2019 Tecnic Software productions (TNSP)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 *
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 * Please read file 'COPYING' for information on license and distribution.
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 */
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "lib64gfx.h"
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	11 #define DM_MEMCMP_SIZE(mptr, mcmp) memcmp((mptr), (mcmp), sizeof(mcmp))
7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	12 #define DM_MEMCMP_LEN(mptr, mcmp) memcmp((mptr), (mcmp), strlen(mcmp))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	14 static int fmtProbeGigapaintHires(const DMGrowBuf buf, const DMC64ImageFormat fmt)
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	15 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	16 if (buf->len == fmt->size &&
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	17 dmCompareAddr16(buf, 0, fmt->addr))
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	18 return DM_PROBE_SCORE_MAX;
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	19
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	20 return DM_PROBE_SCORE_FALSE;
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	21 }
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	22
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	24 // XXX TODO: Research what these values actually mean. It would seem probable
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	25 // that these may not be static values at all, as there are 8 more that change
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	26 // before actual image data, but do not seem to be used in the image itself.
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	27 static const Uint8 fmtMicroIllustratorMagicID_1[] =
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	28 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	29 0xff, 0x80, 0x69, 0x67, 0x14, 0x00,
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	30 };
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	31
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	32 static const Uint8 fmtMicroIllustratorMagicID_2[] =
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	33 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	34 0xe8, 0x03, 0xe8, 0x03, 0x40, 0x1f,
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	35 };
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	36
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	37 static int fmtProbeMicroIllustrator(const DMGrowBuf buf, const DMC64ImageFormat fmt)
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	38 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	39 if (buf->len == fmt->size &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	40 DM_MEMCMP_SIZE(buf->data + 2, fmtMicroIllustratorMagicID_1) == 0
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	41 &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	42 DM_MEMCMP_SIZE(buf->data + 9, fmtMicroIllustratorMagicID_2) == 0
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	43 )
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	44 return DM_PROBE_SCORE_MAX;
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	45
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	46 return DM_PROBE_SCORE_FALSE;
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	47 }
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	48
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	49
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	50 static int fmtEncodeMicroIllustrator(const DMC64EncDecOp op, DMGrowBuf buf,
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	51 const DMC64Image img, const DMC64ImageCommonFormat fmt)
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	52 {
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	53 (void) op;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	54 (void) img;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	55 (void) fmt;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	56
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	57 memcpy(buf->data + 2, fmtMicroIllustratorMagicID_1, sizeof(fmtMicroIllustratorMagicID_1));
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	58 memcpy(buf->data + 9, fmtMicroIllustratorMagicID_2, sizeof(fmtMicroIllustratorMagicID_2));
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	59
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	60 return DMERR_OK;
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	61 }
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	62
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	63
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	64 static const Uint8 fmtMarqPETSCII_ID1[] =
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	65 {
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	66 0x01, 0x08, 0x0b, 0x08, 0xef, 0x00, 0x9e, 0x32, 0x30, 0x36,
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	67 0x31, 0x00, 0x00, 0x00, 0xa9, 0x0b, 0x8d, 0x11, 0xd0, 0xa9,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	68 };
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	69
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	70 static const Uint8 fmtMarqPETSCII_ID2[] =
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	71 {
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	72 0x8d, 0x21, 0xd0, 0xa2, 0x00, 0xa0, 0xfa, 0xbd, 0x61, 0x08,
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	73 0x9d, 0x00, 0x04, 0xbd, 0x5b, 0x09, 0x9d, 0xfa, 0x04, 0xbd,
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	74 0x55, 0x0a, 0x9d, 0xf4,
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	75 };
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	76
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	77
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	78 static int fmtProbeMarqPETSCII(const DMGrowBuf buf, const DMC64ImageFormat fmt)
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	79 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	80 (void) fmt;
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	81
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	82 if (buf->len == 2098 &&
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	83 DM_MEMCMP_SIZE(buf->data, fmtMarqPETSCII_ID1) == 0 &&
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	84 DM_MEMCMP_SIZE(buf->data + 0x1f, fmtMarqPETSCII_ID2) == 0
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	85 )
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	86 return DM_PROBE_SCORE_MAX;
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	87
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	88 return DM_PROBE_SCORE_FALSE;
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	89 }
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	90
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	91
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	92 static int fmtSetMarqPETSCIIData(const DMC64EncDecOp op, DMC64Image img,
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	93 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	94 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	95 (void) op;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	96 (void) buf;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	97 (void) fmt;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	98
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	99 switch (img->extraData[0].data[0])
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	100 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	101 case 20: img->extraInfo[D64_EI_CHAR_CASE] = 0; break; // upper case
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	102 case 23: img->extraInfo[D64_EI_CHAR_CASE] = 1; break; // lower case
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	103 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	104 return DMERR_INVALID_DATA;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	105 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	106
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	107 img->extraInfo[D64_EI_CHAR_MODE] = D64_FMT_HIRES;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	108 img->extraInfo[D64_EI_CHAR_CUSTOM] = 0;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	109
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	110 return DMERR_OK;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	111 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	112
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	113
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	114 static int fmtGetPixelPETSCII(Uint8 *col,
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	115 const DMC64Image *img, const int rasterX, const int rasterY)
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	116 {
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	117 DM_C64_GENERIC_CHAR_PIXEL(img)
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	118 int chr = img->screen[0].data[scroffs];
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	119
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	120 if (!img->extraInfo[D64_EI_CHAR_CUSTOM] &&
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	121 img->extraInfo[D64_EI_CHAR_CASE])
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	122 chr += 256; // lower case, so add 256 to char ROM offset
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	123
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	124 switch (img->extraInfo[D64_EI_CHAR_MODE])
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	125 {
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	126 case D64_FMT_HIRES:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	127 return dmC64GetGenericCharSCPixel(
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	128 col, img,
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	129 scroffs, rasterX,
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	130 0, (chr * D64_CHR_SIZE) + (rasterY & 7), chr,
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	131 0, img->bgcolor);
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	132
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	133 case D64_FMT_MC:
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	134 return dmC64GetGenericCharMCPixel(
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	135 col, img,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	136 scroffs, rasterX,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	137 0, (chr * D64_CHR_SIZE) + (rasterY & 7), chr,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	138 0, img->bgcolor, img->d022, img->d023);
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	139
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	140 case D64_FMT_ECM:
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	141 return dmC64GetGenericCharECMPixel(
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	142 col, img,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	143 scroffs, rasterX,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	144 0, ((chr & 0x3f) * D64_CHR_SIZE) + (rasterY & 7), chr,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	145 0, img->bgcolor, img->d022, img->d023, img->d024);
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	146
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	147 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	148 return DMERR_INVALID_DATA;
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	149 }
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	150 }
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	151
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	152
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	153 static const Uint8 fmtPetsciiKrisszHu_ID1[] =
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	154 {
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	155 0x01, 0x08, 0x0b, 0x08, 0x0A, 0x00, 0x9E, 0x32, 0x30, 0x36,
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	156 0x31, 0x00, 0x00, 0x00, 0xA9,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	157 };
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	158
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	159 static const Uint8 fmtPetsciiKrisszHu_ID2[] =
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	160 {
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	161 0x8d, 0x11, 0xd0, 0xa9, 0x80, 0x8d, 0x91, 0x02, 0xa9, 0x18,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	162 };
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	163
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	164
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	165 static int fmtProbePetsciiKrisszHu(const DMGrowBuf buf, const DMC64ImageFormat fmt)
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	166 {
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	167 (void) fmt;
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	168
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	169 if (buf->len == 10193 &&
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	170 DM_MEMCMP_SIZE(buf->data, fmtPetsciiKrisszHu_ID1) == 0 &&
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	171 DM_MEMCMP_SIZE(buf->data + 0x10, fmtPetsciiKrisszHu_ID2) == 0
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	172 )
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	173 return DM_PROBE_SCORE_MAX;
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	174
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	175 return DM_PROBE_SCORE_FALSE;
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	176 }
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	177
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	178
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	179 static int fmtSetPetsciiKrisszHuData(const DMC64EncDecOp op, DMC64Image img,
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	180 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	181 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	182 (void) op;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	183 (void) buf;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	184 (void) fmt;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	185
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	186 const Uint8 *data = img->extraData[0].data;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	187 switch (data[0x0028 - 2])
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	188 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	189 case 0x00:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	190 img->extraInfo[D64_EI_CHAR_MODE] = D64_FMT_HIRES;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	191 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	192 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	193 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	194
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	195 case 0xd8:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	196 img->extraInfo[D64_EI_CHAR_MODE] = D64_FMT_MC;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	197 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	198 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	199 img->d022 = data[0x002d - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	200 img->d023 = data[0x0032 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	201 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	202
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	203 case 0x01:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	204 img->extraInfo[D64_EI_CHAR_MODE] = D64_FMT_ECM;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	205 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	206 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	207 img->d022 = data[0x0028 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	208 img->d023 = data[0x002d - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	209 img->d024 = data[0x0032 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	210 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	211
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	212 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	213 return DMERR_INVALID_DATA;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	214 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	215
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	216 // XXX TODO this format saves the charset data (for 256 chars)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	217 // in the PRG and there is no direct indication whether it is
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	218 // a customized one or copy of C64 ROM charset .. we could
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	219 // implement a hash-based detection at some point.
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	220 img->extraInfo[D64_EI_CHAR_CASE] = 0;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	221 img->extraInfo[D64_EI_CHAR_CUSTOM] = 1;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	222
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	223 return DMERR_OK;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	224 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	225
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	226
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	227 static int fmtProbeKoalaPainter(const DMGrowBuf buf, const DMC64ImageFormat fmt)
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	228 {
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	229 int score = DM_PROBE_SCORE_FALSE;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	230
2112 9dc2976e9fa3 Improve probing of packed and unpacked Koala files. Many converters and Matti Hamalainen <ccr@tnsp.org> parents: 2080 diff changeset	231 if (buf->len == 10003 \|\|
9dc2976e9fa3 Improve probing of packed and unpacked Koala files. Many converters and Matti Hamalainen <ccr@tnsp.org> parents: 2080 diff changeset	232 buf->len == 10004)
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	233 score += DM_PROBE_SCORE_MAYBE;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	234
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	235 if (dmCompareAddr16(buf, 0, fmt->addr))
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	236 score += DM_PROBE_SCORE_MAYBE;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	237
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	238 return score;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	239 }
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	240
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	241
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	242 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	243 {
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	244 // 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	245 if (buf->len > 30 &&
2112 9dc2976e9fa3 Improve probing of packed and unpacked Koala files. Many converters and Matti Hamalainen <ccr@tnsp.org> parents: 2080 diff changeset	246 buf->len < 10002 &&
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	247 dmCompareAddr16(buf, 0, fmt->addr))
1771 c261db6e39aa Adjust some probe scores. Matti Hamalainen <ccr@tnsp.org> parents: 1770 diff changeset	248 return DM_PROBE_SCORE_GOOD;
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	249
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	250 return DM_PROBE_SCORE_FALSE;
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	251 }
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	252
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	253
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	254 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	255 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	256 if (buf->len > 32 &&
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	257 (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	258 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	259 // 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	260 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	261 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	262 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	263 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	264
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	265 // Unpacked variant
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	266 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	267 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	268 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	269
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	270 return DM_PROBE_SCORE_FALSE;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	271 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	272
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	273
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	274 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	275 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	276 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	277 DMGrowBuf mem;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	278 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	279
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	280 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	281 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	282 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	283 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	284
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	285 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	286 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	287
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	288 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	289
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	290 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	291 dmGrowBufFree(&mem);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	292 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	293 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	294
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	295
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	296 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	297 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	298 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	299 DMGrowBuf tmp;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	300 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	301
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	302 // 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	303 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	304 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	305
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	306 // 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	307 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	308 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	309 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	310 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	311 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	312 cfg.rleMaxCountB = 255;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	313 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	314
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	315 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	316 dmGrowBufFree(&tmp);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	317 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	318 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	319
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	320
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	321 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	322 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	323 const Uint8 *ident = buf->data + 2;
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	324 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	325 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	326 DM_MEMCMP_LEN(ident, "DRAZPAINT ") == 0 &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 ident[11] == '.' && (
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 (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	329 (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	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_MAX;
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 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	334 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	337 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	338 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	340 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	341 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342
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	343 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	344 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	345 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	346 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	347
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	348 if ((res = dmDecodeGenericRLEAlloc(&mem,
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	349 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	350 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	352 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	353
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358
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 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	361 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 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	364 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	365 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	366
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 // 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	368 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	369 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370
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	371 // 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	372 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	373 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	374 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	375 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	376 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	378 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	379
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380 // 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	381 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	382 !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	383 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388 // 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	389 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	390
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	397 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	398 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	399 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	400 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	401 DM_MEMCMP_LEN(buf->data + 2, "DRAZLACE! 1.0") == 0)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 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	403
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 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	405 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	408 static int fmtDrazLaceGetLaceType(const DMC64EncDecOp op, DMC64Image img,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	409 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 (void) fmt;
1930 c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	412
c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	413 if (buf != NULL)
c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	414 img->laceType = buf->data[op->offs] ? D64_ILACE_RES : D64_ILACE_COLOR;
c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	415 else
c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	416 img->laceType = D64_ILACE_RES;
c048da352279 Default to D64_ILACE_RES if the given buffer is NULL in fmtDrazLaceGetLaceType(). Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	417
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	418 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	422 static int fmtDrazLaceSetLaceType(const DMC64EncDecOp op, DMGrowBuf buf,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	423 const DMC64Image img, const DMC64ImageCommonFormat fmt)
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	424 {
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	425 (void) fmt;
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	426 buf->data[op->offs] = (img->laceType == D64_ILACE_RES) ? 1 : 0;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	427 return DMERR_OK;
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	428 }
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	429
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	430
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	431 static int fmtGetPixelDrazLace(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	432 const DMC64Image *img, const int rasterX, const int rasterY)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	433 {
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	434 const int
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	435 x = rasterX / 8,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	436 y = rasterY / 8,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	437 yoffs = y * img->fmt->chWidth,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	438 bmoffs = yoffs * 8 + (rasterY & 7) + (x * 8),
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	439 scroffs = yoffs + x,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	440 vshift = 6 - (rasterX & 6);
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	441
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	442 return dmC64GetGenericMCPixel(col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	443 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	444 vshift, 0,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	445 rasterX & 1, 0, img->bgcolor);
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	446 }
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	447
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	448
1662 34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	449 static const char *fmtBDP5MagicID = "BDP 5.00";
34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	450
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	451 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	452 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	453 if (buf->len > 20 &&
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	454 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	455 DM_MEMCMP_LEN(buf->data + 2, fmtBDP5MagicID) == 0)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	456 return DM_PROBE_SCORE_MAX;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	457
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	458 return DM_PROBE_SCORE_FALSE;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	459 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	460
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	461
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	462 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	463 {
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	464 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	465 DMGrowBuf mem, tmp;
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	466 DMCompParams cfg;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	467
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	468 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	469 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	470 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	471 cfg.rleMarkerB = buf->data[8];
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	472 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	473
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	474 // 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	475 // 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	476 // 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	477 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	478 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	479
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	480 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	481
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	482 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	483 goto out;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	484
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	485 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	486
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	487 out:
1792 905c09049fe6 Oops, forgot to free the buffer allocated in the BDP5 decoder. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1791 diff changeset	488 dmGrowBufFree(&tmp);
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	489 dmGrowBufFree(&mem);
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	490 return res;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	491 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	492
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	493
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	494 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	495 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	496 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	497 DMGrowBuf mem;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	498 DMCompParams cfg;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	499
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	500 // 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	501 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	502 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	503
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	504 // 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	505 cfg.func = fmt->name;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	506 cfg.type = DM_COMP_RLE_MARKER;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	507 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	508 cfg.rleMinCountB = 4;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	509 cfg.rleMaxCountB = 255;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	510 cfg.rleMinCountW = 256;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	511 cfg.rleMaxCountW = 1024;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	512
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	513 dmGenericRLEAnalyze(&mem, &cfg);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	514
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	515 // 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	516 if (!dmGrowBufPut(buf, (Uint8 *) fmtBDP5MagicID, strlen(fmtBDP5MagicID)) \|\|
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	517 !dmGrowBufPutU8(buf, cfg.rleMarkerB) \|\|
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	518 !dmGrowBufPutU8(buf, cfg.rleMarkerW))
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	519 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	520 res = DMERR_MALLOC;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	521 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	522 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	523
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	524 // 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	525 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	526
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	527 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	528 dmGrowBufFree(&mem);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	529 return res;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	530 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	531
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	532
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	533 static const char *fmtGunPaintMagicID = "GUNPAINT (JZ) ";
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	534 #define fmtGunPaintMagicLen (14)
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	535 #define fmtGunPaintMagicOffs (0x3e8)
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	536
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	537 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	538 {
1845 a77451bb6614 Improve GunPaint format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1844 diff changeset	539 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	540 dmCompareAddr16(buf, 0, fmt->addr) &&
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	541 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	542 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	543
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 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	545 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	548 static int fmtEncodeGunPaint(const DMC64EncDecOp op, DMGrowBuf buf,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	549 const DMC64Image img, const DMC64ImageCommonFormat fmt)
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	550 {
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	551 (void) op;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	552 (void) img;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	553 (void) fmt;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	554
1946 c30dfd5e3227 Add a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1941 diff changeset	555 // Here we assume that the op triggering this function is
c30dfd5e3227 Add a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1941 diff changeset	556 // at the end of the oplist, so the memory is allocated,
1848 273e274f9ed6 Fix encoding of GunPaint format by placing the magic ID in correct position. Matti Hamalainen <ccr@tnsp.org> parents: 1847 diff changeset	557 memcpy(buf->data + fmtGunPaintMagicOffs + 2, fmtGunPaintMagicID, fmtGunPaintMagicLen);
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	558
27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	559 return DMERR_OK;
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	560 }
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	561
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	562
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	563 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	564 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 size_t i, n;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	567 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	568 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	569
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 // 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	571 // as do some GunPaint images ..
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	572 if (buf->len == 9002 \|\|
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	573 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	574 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	575
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	576 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	577 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	578
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 if (n > 50)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 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	581 if (n > 25)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 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	583 if (n > 10)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 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	585
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 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	587 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	590 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	591 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 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	594 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 // 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	597 // 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	598 if (dmGrowBufCopy(&tmp, buf, 1) == NULL)
768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	599 return DMERR_MALLOC;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600
1751 768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	601 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	602
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 // 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	604 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	605 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	606 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	607 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	608
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	609 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	610 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 // 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	613 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	614
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	622 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	623 {
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	624 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	625 DMGrowBuf mem;
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	626 DMCompParams cfg;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	627
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	628 // 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	629 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	630 goto out;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	631
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	632 // 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	633 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	634 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	635 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	636 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	637 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	638 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	639
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	640 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	641
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	642 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	643 dmGrowBufFree(&mem);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	644 return res;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	645 }
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	646
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	647
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	648 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	649 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	650 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	651 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	652 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	653
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	654 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	655 }
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	656
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	657
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	658 static int fmtGetPixelFLIDesigner(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	659 const DMC64Image *img, const int rasterX, const int rasterY)
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	660 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	661 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	662
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	663 return dmC64GetGenericMCPixel(col, img,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	664 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	665 vshift, rasterY & 7,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	666 0, 0, img->bgcolor);
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	667 }
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	668
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	669
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	670 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	671 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	672 if (buf->len > 16 &&
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	673 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	674 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	675 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	676 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	677
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	678 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	679 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	680
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	681
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	682 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	683 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	684 int res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	685 DMGrowBuf dst, src;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	686 DMCompParams cfg;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	687
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	688 cfg.func = fmt->name;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	689 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	690 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	691 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	692 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	693 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	694
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	695 // 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	696 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	697
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	698 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	699 goto out;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	700
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	701 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	702
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	703 out:
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	704 dmGrowBufFree(&dst);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	705 return res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	706 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	707
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	708
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	709 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	710 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	711 int res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	712 DMGrowBuf tmp1, tmp2;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	713 DMCompParams cfg;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	714
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	715 dmGrowBufInit(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	716 dmGrowBufInit(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	717
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	718 // 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	719 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	720 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	721
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	722 // 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	723 cfg.func = fmt->name;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	724 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	725 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	726 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	727 cfg.rleMinCountB = 4;
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	728 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	729
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	730 dmGenericRLEAnalyze(&tmp1, &cfg);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	731
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	732 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	733 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	734
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	735 // 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	736 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	737 !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	738 !dmGrowBufPutU16LE(buf, 0x7f3f) \|\|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	739 !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	740 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	741 res = DMERR_MALLOC;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	742 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	743 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	744
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	745 out:
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	746 dmGrowBufFree(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	747 dmGrowBufFree(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	748 return res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	749 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	750
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	751
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	752 static int fmtGetPixelBlackMailFLI(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	753 const DMC64Image *img, const int rasterX, const int rasterY)
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	754 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	755 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	756
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	757 Uint8 bgcol = (unsigned) rasterY < img->extraData[0].size ?
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	758 img->extraData[0].data[rasterY] : img->bgcolor;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	759
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	760 return dmC64GetGenericMCPixel(col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	761 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	762 vshift, rasterY & 7,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	763 0, 0, bgcol & 15);
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	764 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	765
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	766
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	767 static int fmtTruePaintGetLaceType(const DMC64EncDecOp op, DMC64Image img,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	768 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 (void) op;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 (void) buf;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 (void) fmt;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 img->laceType = D64_ILACE_RES;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	774 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	778 static int fmtGetPixelTruePaint(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	779 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	781 const int
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	782 x = rasterX / 8,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	783 y = rasterY / 8,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	784 yoffs = y * img->fmt->chWidth,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	785 bmoffs = yoffs * 8 + (rasterY & 7) + (x * 8),
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	786 scroffs = yoffs + x,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	787 vshift = 6 - (rasterX & 6);
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	788
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	789 return dmC64GetGenericMCPixel(col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	790 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	791 vshift, 0,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	792 rasterX & 1, 0, img->bgcolor);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	796 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	797 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	798 // 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	799 // relocation of decompression code
1684 e7990551c6d6 Rename function variable. Matti Hamalainen <ccr@tnsp.org> parents: 1671 diff changeset	800 static const Uint8 magicID[] = {
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	801 0x0b, 0x08, 0x09, 0x00, 0x9e, 0x32, 0x30, 0x35,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	802 0x39, 0x00, 0xa2, 0x00, 0x78, 0xbd, 0x1c, 0x08,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	803 0x9d, 0xf5, 0x00, 0xe8, 0xd0, 0xf7, 0xe6, 0x01,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	804 0x4c, 0x01, 0x01, 0xa5, 0xfe, 0xd0, 0x02, 0xc6,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	805 0xff, 0xc6, 0xfe
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	806 };
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	807
1789 9f5c5ab0e85e Adjust True Paint probing to be slightly more forgiving vs. file size. Matti Hamalainen <ccr@tnsp.org> parents: 1788 diff changeset	808 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	809 dmCompareAddr16(buf, 0, fmt->addr) &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	810 DM_MEMCMP_SIZE(buf->data + 2, magicID) == 0)
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	811 return DM_PROBE_SCORE_MAX;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	812
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	813 return DM_PROBE_SCORE_FALSE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	814 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	815
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	816
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	817 //
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	818 // 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	819 // 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	820 // simplistic "codebook".
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	821 //
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	822 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	823 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	824 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	825 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	826 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	827 "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	828 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	829 else
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	830 return DMERR_OK;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	831 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	832
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	833
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	834 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	835 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	836 int res = DMERR_OK;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	837 const Uint8 codeBook1, codeBook2;
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	838 DMGrowBuf dst, src;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	839 DMCompParams cfg;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	840 Uint8 data;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	841
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	842 // 1b7e-67e8 decoded by original depacker
12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	843 // 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	844 cfg.func = fmt->name;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	845 cfg.type = DM_COMP_RLE_MARKER;
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	846 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	847 cfg.rleMarkerB = 0xfe;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	848 cfg.cropOutLen = 0x67e8 - 0x1c00;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	849
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	850 // 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	851 codeBook1 = psrc->data + 0x81 - 2;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	852 codeBook2 = psrc->data + 0x85 - 2;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	853
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	854 // Allocate output buffer
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	855 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	856 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	857
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	858 // 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	859 // 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	860 dmGrowBufConstCopy(&src, psrc);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	861 dmSetupRLEBuffers(&dst, &src, &cfg);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	862
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	863 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	864 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	865 unsigned int count = 1;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	866 BOOL found = FALSE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	867
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	868 for (int n = 0; n < 8; n++)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	869 if (codeBook1[n] == data && !found)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	870 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	871 found = TRUE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	872 switch (n)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	873 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	874 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	875 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	876 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	877
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	878 count = data;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	879 if (data == 0)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	880 goto finish;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	881
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	882 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	883
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	884 case 1: // Y = 1, JTO = $17
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	885 count += 2;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	886 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	887
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	888 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	889 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	890 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	891 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	892
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	893 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	894 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	895 goto out;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	896
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	897 count = data;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	898 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	899
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	900 case 3: // Y = 3, JTO = $0B
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	901 count += 2;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	902 data = 0;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	903 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	904
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	905 default: // Y = [5..8], JTO = $00
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	906 count++;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	907 data = codeBook2[n];
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	908 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	909 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	910 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	911
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	912 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	913 goto out;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	914 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	915
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	916 finish:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	917 dmFinishRLEBuffers(&dst, &src, &cfg);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	918 res = dmC64DecodeGenericBMP(img, &dst, fmt);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	919
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	920 out:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	921 dmGrowBufFree(&dst);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	922 return res;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	923 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	924
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	925
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	926 #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	927 #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	928 #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	929 #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	930 #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	931
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	933 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	934 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	935 if (buf->len >= XX2_MIN_SIZE &&
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	936 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	937 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	938 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	939
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 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	941 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	943
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	944 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	945 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	946 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	947 DMGrowBuf tmp;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	949 // 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	950 // 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	951 // 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	952 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	953 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	954
1748 9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	955 tmp.len = tmp.size;
9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	956 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	957 dmGrowBufFree(&tmp);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	958 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	959 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	962 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	963 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	964 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	965 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	966 // Packed variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	967 if (fmt->size == 0 &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	968 dmCompareAddr16(buf, 2, fmt->addr + buf->len - 3) &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	969 dmCompareAddr16(buf, 4, 0x7ff2))
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	970 return DM_PROBE_SCORE_MAX;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	971
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	972 // Unpacked variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	973 if (fmt->size != 0 && fmt->size == buf->len)
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	974 return DM_PROBE_SCORE_GOOD;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	975 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	976
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	977 return DM_PROBE_SCORE_FALSE;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	978 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	979
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	980
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	981 static int fmtDecodeCosmosDesignsHiresManagerPacked(DMC64Image img, const DMGrowBuf psrc, const DMC64ImageFormat *fmt)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	982 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	983 int res;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	984 DMGrowBuf src, tmp;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	985 DMCompParams cfg;
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	986 Uint8 data, count, *dstBuf;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	987 const size_t dstSize = 0x7ff2 - 0x4000;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	988 size_t dstOffs;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	989 BOOL getByte = TRUE;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	990
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	991 // Setup the RLE config, only for input
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	992 cfg.func = fmt->name;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	993 cfg.type = DM_COMP_RLE_MARKER;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	994 cfg.flags = DM_RLE_BACKWARDS_INPUT;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	995
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	996 // Allocate output buffer
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	997 if ((dstBuf = dmMalloc0(dstSize)) == NULL)
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	998 {
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	999 return dmError(DMERR_MALLOC,
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1000 "%s: Could not allocate memory for RLE decoding buffer.\n",
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1001 cfg.func);
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1002 }
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1003
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1004 // Setup input buffer
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1005 dmGrowBufConstCopy(&src, psrc);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1006 dmSetupRLEBuffers(NULL, &src, &cfg);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1007 dstOffs = dstSize;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1008
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1009 while (dstOffs > 0 && src.offs > 0)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1010 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1011 if (getByte && !dmGrowBufGetU8(&src, &data))
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1012 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1013 res = dmError(DMERR_INVALID_DATA,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1014 "%s: RLE: Invalid data/out of data for literal sequence.\n",
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1015 cfg.func);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1016 goto out;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1017 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1018
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1019 // A simple marker byte RLE variant: [Marker] [count] [data]
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1020 if (data == 0)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1021 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1022 if (!dmGrowBufGetU8(&src, &count) \|\|
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1023 !dmGrowBufGetU8(&src, &data))
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1024 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1025 res = dmError(DMERR_INVALID_DATA,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1026 "%s: RLE: Invalid data/out of data for run sequence.\n",
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1027 cfg.func);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1028 goto out;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1029 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1030
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1031 int ncount = (int) count;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1032 for (int n = 1; n < ncount && dstOffs > 0; n++)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1033 dstBuf[--dstOffs] = data;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1034
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1035 getByte = TRUE;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1036 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1037 else
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1038 // Literal run of data bytes
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1039 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1040 int ncount = (int) data;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1041 for (int n = 0; n < ncount; n++)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1042 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1043 if (!dmGrowBufGetU8(&src, &data))
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1044 goto finish;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1045
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1046 if (dstOffs > 0)
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1047 dstBuf[--dstOffs] = data;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1048 else
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1049 goto finish;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1050 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1051 getByte = FALSE;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1052 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1053 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1054
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1055 finish:
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1056
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1057 dmGrowBufConstCreateFrom(&tmp, dstBuf, 0x3fff);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1058 res = dmC64DecodeGenericBMP(img, &tmp, fmt);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1059
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1060 out:
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1061 dmGrowBufFree(&src);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1062 dmFree(dstBuf);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1063 return res;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1064 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1065
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1066
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1067 #define FUNPAINT2_HEADER_SIZE (0x10)
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1068 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	1069
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1070
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1071 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	1072 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1073 if (buf->len > 30 &&
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	1074 DM_MEMCMP_LEN(buf->data + 2, fmtFunPaint2MagicID) == 0)
1777 a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1075 {
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1076 // Unpacked variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1077 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	1078 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	1079
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1080 // Packed variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1081 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	1082 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	1083 }
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1084
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1085 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	1086 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1087
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1088
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1089 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	1090 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1092 DMGrowBuf tmp;
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1093
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1094 // 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	1095 if (buf->data[14])
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1096 {
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1097 DMGrowBuf mem;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1098 DMCompParams cfg;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1099
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	1100 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1101 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1102 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1103 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	1104
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1105 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	1106 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	1107
1598 b5e0f28f1842 Adjust Fun Paint 2 decoding now that the RLE decoding is fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1594 diff changeset	1108 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	1109 &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	1110 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	1111
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1112 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	1113 dmGrowBufFree(&tmp);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1114 }
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1115 else
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1116 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1117 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	1118 }
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1119
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1120 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1121 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1122
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1123
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1124 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	1125 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1126 // Add the header bits
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1127 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	1128 !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	1129 !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	1130 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1131
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1132 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	1133 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1134
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1135
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1136 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	1137 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1138 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1139 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	1140 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1141
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1142 // 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	1143 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	1144 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1145
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	1146 // 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	1147 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1148 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	1149 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	1150 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1151 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1152
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1153 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	1154
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1155 // Add the header bits
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1156 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	1157 !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	1158 !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	1159 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1162 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1163
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1164 // 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	1165 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	1166
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1167 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1168 dmGrowBufFree(&mem);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1169 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1170 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1171
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1172
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1173 static int fmtGetPixelFunPaint2(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1174 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1175 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1176 const int
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1177 x = rasterX / 8,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1178 y = rasterY / 8,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1179 yb = rasterY & 7,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1180 yoffs = y * img->fmt->chWidth,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1181 bmoffs = yoffs * 8 + yb + (x * 8),
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1182 scroffs = yoffs + x,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1183 bitmap = rasterX & 1,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1184 vbank = yb + (bitmap * 8),
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1185 vshift = 6 - (rasterX & 6);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1186
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1187 Uint8 bgcol = (unsigned) rasterY < img->extraData[0].size ?
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1188 img->extraData[0].data[rasterY] : img->bgcolor;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1189
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1190 return dmC64GetGenericMCPixel(col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1191 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1192 vshift, vbank,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1193 bitmap, 0, bgcol & 15);
1503 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
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1196
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1197 static int fmtGetPixelBFLI(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1198 const DMC64Image *img, const int rasterX, const int rasterY)
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1199 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1200 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1201 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	1202 const int vbank = (rasterY & 7) + (vbb * 8);
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1203
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1204 return dmC64GetGenericMCPixel(col, img,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1205 bmoffs & 0x1fff, scroffs & 0x3ff,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1206 vshift, vbank,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1207 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	1208 }
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1209
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1210
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1211 static int fmtGetPixelPentelPaint(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1212 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1213 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1214 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1215 const int ry = rasterY / D64_SPR_HEIGHT_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1216 const int yd = rasterY % D64_SPR_HEIGHT_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1217 const int rx = rasterX / D64_SPR_WIDTH_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1218 const int xd = rasterX % D64_SPR_WIDTH_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1219 const int offs = (ry * 8 + rx) * D64_SPR_SIZE + (yd * D64_SPR_WIDTH_UT) + (xd / 8);
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	1220 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	1221
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1222 Uint8 color1,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1223 color2 = img->extraData[0].data[offs] & mask ? 0x0f : 0,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1224 color3 = img->extraData[0].data[offs + D64_SPR_SIZE * 155] & mask ? img->d022 : 0;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1225
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1226 int res;
1860 01d7feb9f9ce Some work on Pentel Paint sprite layer support. Does not work very well yet. Matti Hamalainen <ccr@tnsp.org> parents: 1857 diff changeset	1227
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1228 if ((res = dmC64GetGenericSCPixel(&color1, img, bmoffs, scroffs, vshift, 0, 0)) != DMERR_OK)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1229 return res;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1230
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1231 *col = color3 ? color3 : ( color2 ? color2 : color1 );
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1232 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1233 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1235
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1236 static int fmtGetPixelHCB(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1237 const DMC64Image *img, const int rasterX, const int rasterY)
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1238 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1239 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1240 const int vbank = (rasterY / 4) & 1;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1241 const int ry = rasterY / 5;
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1242
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1243 Uint8 bgcol = (unsigned) ry < img->extraData[0].size ?
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1244 img->extraData[0].data[ry] : img->bgcolor;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1245
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1246 return dmC64GetGenericMCPixel(col, img,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1247 bmoffs, scroffs,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1248 vshift, vbank,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1249 0, vbank, bgcol & 15);
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1250 }
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1251
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1252
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1253 static int fmtGetPixelCrestHIFLIorCDHM(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1254 const DMC64Image *img, const int rasterX, const int rasterY)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1256 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1257
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1258 return dmC64GetGenericSCPixel(col, img,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1259 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1260 vshift, rasterY & 7, 0);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1261 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1264 static int fmtECIGetLaceType(const DMC64EncDecOp op, DMC64Image img,
1984 e7f2ddaf94a6 Change encode and decode function format parameter type from DMC64ImageFormat to DMC64ImageCommonFormat. Matti Hamalainen <ccr@tnsp.org> parents: 1983 diff changeset	1265 const DMGrowBuf buf, const DMC64ImageCommonFormat 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	1266 {
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1267 (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	1268 (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	1269 (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	1270 img->laceType = D64_ILACE_COLOR;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1271 return DMERR_OK;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1272 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1273
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1274
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1275 static int fmtGetPixelECI(Uint8 *col,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1276 const DMC64Image *img, const int rasterX, const int rasterY)
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1277 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1278 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
1764 52e31cfc1e36 Implement fake X raster position for the pixel getting functions. At some Matti Hamalainen <ccr@tnsp.org> parents: 1763 diff changeset	1279 const int vbank = rasterY & 7;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1280 Uint8 color1, color2;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1281 int res;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1282
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1283 if ((res = dmC64GetGenericSCPixel(&color1, img, bmoffs, scroffs, vshift, vbank , 0)) != DMERR_OK \|\|
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1284 (res = dmC64GetGenericSCPixel(&color2, img, bmoffs, scroffs, vshift, vbank + 8, 1)) != DMERR_OK)
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1285 return res;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1286
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1287 col = (color1 D64_NCOLORS) + color2;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1288 return DMERR_OK;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1289 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1290
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1291
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1930 diff changeset	1292 static int fmtConvertECIBMP2Image(DMImage dst, const DMC64Image src,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1930 diff changeset	1293 const DMC64ImageFormat fmt, const DMC64ImageConvSpec spec)
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1294 {
2127 c1a9519a619f Fix ECI palette setting, return value of dmSetMixedColorC64Palette() had Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1295 int res;
c1a9519a619f Fix ECI palette setting, return value of dmSetMixedColorC64Palette() had Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1296 if ((res = dmSetMixedColorC64Palette(dst)) != DMERR_OK)
c1a9519a619f Fix ECI palette setting, return value of dmSetMixedColorC64Palette() had Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1297 return res;
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1298
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1930 diff changeset	1299 return dmC64ConvertGenericBMP2Image(dst, src, fmt, spec);
1734 183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1300 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1301
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1302
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1303 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	1304 {
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1305 size_t i, n;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1306
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1307 // 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	1308 // 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	1309 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	1310 !dmCompareAddr16(buf, 0, fmt->addr) \|\|
1760 c944844e437f Improve fmtProbeECIPacked() probing. Matti Hamalainen <ccr@tnsp.org> parents: 1759 diff changeset	1311 // Try to avoid misprobe of Crest Hires FLI Designer and Cosmos Design format
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	1312 buf->len == 16386 \|\| buf->len == 16385 \|\|
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	1313 // Face Painter
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	1314 buf->len == 10004)
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1315 return DM_PROBE_SCORE_FALSE;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1316
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1317 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	1318 if (buf->data[i] == buf->data[2]) n++;
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1319
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1320 if (n > 50)
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1321 return DM_PROBE_SCORE_GOOD;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1322 if (n > 25)
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1323 return DM_PROBE_SCORE_AVG;
1746 dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1324 if (n > 10)
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1325 return DM_PROBE_SCORE_MAYBE;
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1326
dd57dd9430cb Improve ECI packed format probing. Matti Hamalainen <ccr@tnsp.org> parents: 1745 diff changeset	1327 return DM_PROBE_SCORE_FALSE;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1328 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1329
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1330
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1331 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	1332 {
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1333 int res;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1334 DMGrowBuf tmp;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1335 DMGrowBuf mem;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1336 DMCompParams cfg;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1337
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1338 cfg.func = fmt->name;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1339 cfg.type = DM_COMP_RLE_MARKER;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1340 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	1341 cfg.rleMarkerB = buf->data[0];
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1342
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1343 if ((res = dmDecodeGenericRLEAlloc(
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	1344 &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	1345 res = dmC64DecodeGenericBMP(img, &mem, fmt);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1346
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1347 dmGrowBufFree(&mem);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1348 return res;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1349 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1350
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1351
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1352 static int fmtEncodeECIPacked(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1353 {
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1354 int res;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1355 DMGrowBuf tmp;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1356 DMCompParams cfg;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1357
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1358 // Encode the data to temp buffer
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1359 if ((res = dmC64EncodeGenericBMP(TRUE, &tmp, img, fmt)) != DMERR_OK)
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1360 goto out;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1361
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1362 // Analyze and setup RLE
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1363 cfg.func = fmt->name;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1364 cfg.type = DM_COMP_RLE_MARKER;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1365 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1366 cfg.rleMinCountB = 4;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1367 cfg.rleMaxCountB = 255;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1368
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1369 dmGenericRLEAnalyze(&tmp, &cfg);
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1370
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1371 // Add the header bits
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1372 if (!dmGrowBufPutU8(buf, cfg.rleMarkerB))
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1373 {
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1374 res = DMERR_MALLOC;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1375 goto out;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1376 }
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1377
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1378 // And now RLE compress the data to the existing buffer
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1379 res = dmEncodeGenericRLE(buf, &tmp, &cfg);
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1380
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1381 out:
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1382 dmGrowBufFree(&tmp);
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1383 return res;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1384 }
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1385
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1386
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1387 //
1795 c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	1388 // Helper macros for defining screen memory layouts
c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	1389 // 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	1390 //
2033 cf966e66c9af Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 2018 diff changeset	1391 #define DEF_SCREEN_RAM(start, oindex, bindex, osize, bsize) \
cf966e66c9af Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 2018 diff changeset	1392 { DO_COPY, DS_SCREEN_RAM, (start) + ((osize) * (oindex)), (bindex), (bsize), 0, NULL, NULL }
cf966e66c9af Indentation. Matti Hamalainen <ccr@tnsp.org> parents: 2018 diff changeset	1393
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	1394 #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	1395 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	1396 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	1397 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	1398 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	1399 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	1400 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	1401 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	1402 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	1403
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1404
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1405
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1406 //
1861 752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	1407 // Many formats actually share memory layout and other specs, and there are
752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	1408 // packed and unpacked versions of several formats. We'll reuse these here
752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	1409 // through this common formats data array, referred from dmC64ImageFormats[]
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1410 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1411 DMC64ImageCommonFormat dmC64CommonFormats[] =
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1412 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	1413 { // #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	1414 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1415 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1416 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1417 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1418 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1419 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1420 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1421 { 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	1422 { 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	1423 { 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	1424 { 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	1425 { 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	1426 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1427 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1428
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1429 { // #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	1430 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1431 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1432 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1433 2, 1,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1434 NULL, NULL,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1435 fmtGetPixelBlackMailFLI,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1436 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1437 { 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	1438 { 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	1439 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	1440 { 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	1441 { 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	1442 }
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1443 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1444
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1445 { // #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	1446 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1447 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1448 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1449 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1450 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1451 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1452 {
1846 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_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	1454 { 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	1455 { 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	1456 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1457 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1458
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1459 { // #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	1460 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1461 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1462 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1463 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1464 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1465 fmtGetPixelFunPaint2,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1466 {
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	1467 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	1468 { 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	1469 { 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	1470 { 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	1471 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	1472 { 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	1473 { DO_COPY , DS_EXTRA_DATA , 0x8328, 0, 100, 100, NULL, NULL },
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1915 diff changeset	1474 { DO_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	1475 { 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	1476 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1477 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1478
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1479 { // #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	1480 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1481 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1482 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1483 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1484 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1485 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1486 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1487 { 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	1488 { 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	1489 { 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	1490 { 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	1491 { 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	1492 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1493 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1494
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1495 { // #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	1496 D64_FMT_MC \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1497 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1498 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1499 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1500 NULL, NULL,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1501 fmtGetPixelDrazLace,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1502 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1503 { 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	1504 { 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	1505 { 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	1506 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL },
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1915 diff changeset	1507 { DO_FUNC , 0 , 0x2742, 0, 1, 0, fmtDrazLaceGetLaceType, fmtDrazLaceSetLaceType },
1880 efe6e88a02f3 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1879 diff changeset	1508 { DO_COPY , DS_BITMAP_RAM , 0x2800, 1, 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	1509 { 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	1510 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1511 },
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1512
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1513 { // #6: TruePaint
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1514 D64_FMT_MC \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1515 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1516 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1517 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1518 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1519 fmtGetPixelTruePaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1520 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1521 { 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	1522 { 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	1523 { 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	1524 { 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	1525 { 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	1526 { DO_COPY , DS_COLOR_RAM , 0x4800, 0, 0, 0, NULL, NULL },
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1915 diff changeset	1527 { DO_FUNC , 0 , 0x0000, 0, 0, 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	1528 { 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	1529 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1530 },
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 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 { // #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	1533 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1534 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1535 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1536 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1537 fmtConvertECIBMP2Image, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1538 fmtGetPixelECI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1539 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1540 { 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	1541 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	1542 { 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	1543 DEF_SCREEN_RAMS_8(0x6000, 8, 0x400, 0),
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1915 diff changeset	1544 { DO_FUNC , 0 , 0 , 0, 0, 0, fmtECIGetLaceType, NULL },
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1545 { 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	1546 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1547 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1548
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1549 { // #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	1550 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1551 D64_SCR_WIDTH, 248, // Actually 296 x 192 (=248)
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1552 D64_SCR_CH_WIDTH, 24,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1553 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1554 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1555 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1556 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1557 { 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	1558 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	1559 { 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	1560 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1561 },
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	1562
2018 1c45b2fb471d Adjust a comment. Matti Hamalainen <ccr@tnsp.org> parents: 2015 diff changeset	1563 { // #9: FBI Crew FLI Designer 1.x & 2.0
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	1564 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1565 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1566 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1567 2, 1,
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	1568 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	1569 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	1570 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1571 { 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	1572 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	1573 { 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	1574 { 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	1575 }
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	1576 },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1577
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1578 { // #10: Doodle
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1579 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1580 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1581 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1582 1, 1,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1583 NULL, NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1584 NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1585 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1586 { 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	1587 { 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	1588 { 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	1589 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1590 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1591 };
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1592
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1593
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1594 //
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1595 // 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	1596 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1597 DMC64ImageFormat dmC64ImageFormats[] =
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 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1600 "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	1601 fmtProbeDrazPaint20Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1602 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	1603 { }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1604 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1605
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1606 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1607 "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	1608 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1609 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	1610 { }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1611 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1612
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1613 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1614 "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	1615 fmtProbeDrazLace10Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1616 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	1617 { }, &dmC64CommonFormats[5]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1618 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1619
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1620 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1621 "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	1622 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1623 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	1624 { }, &dmC64CommonFormats[5]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1625 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1626
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1627 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1628 "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	1629 fmtProbeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1630 fmtDecodeBDP5Packed, fmtEncodeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1631 { }, &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	1632 },
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 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1635 "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	1636 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1637 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1638 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1639 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1640 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1641 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1642 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	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_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	1647 { 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	1648 { 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	1649 { 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	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
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1654 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1655
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1656 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1657 "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	1658 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1659 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1660 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1661 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1662 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1663 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1664 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1665 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1666 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1667 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1668 { 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	1669 { 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	1670 { 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	1671 { 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	1672 { 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	1673 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1674 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1675 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1676 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1677
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1678 {
1816 8d7b424197bc Allow writing of unpacked True Paint format. Matti Hamalainen <ccr@tnsp.org> parents: 1815 diff changeset	1679 "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	1680 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1681 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	1682 { }, &dmC64CommonFormats[6]
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1683 },
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1684
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1685 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1686 "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	1687 fmtProbeTruePaintPacked,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1688 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	1689 { }, &dmC64CommonFormats[6]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1690 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1691
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1692 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	1693 "kla", "Koala Painter (unpacked)", 0x6000, 10003, DM_FMT_RDWR,
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	1694 fmtProbeKoalaPainter,
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1695 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	1696 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1697 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1698
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1699 {
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	1700 "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	1701 fmtProbeKoalaPainterPacked,
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	1702 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	1703 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1704 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1705
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1706 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1707 "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	1708 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1709 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1710 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1711 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1712 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1713 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1714 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1715 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1716 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1717 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1718 { 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	1719 { 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	1720 { 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	1721 { 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	1722 { 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	1723 { 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	1724 },
1593 a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	1725 },
a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	1726 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1727 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1728
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1729 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1730 "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	1731 NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1732 NULL, NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1733 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1734 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1735 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1736 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1737 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1738 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1739 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1740 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1741 { 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	1742 { 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	1743 { 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	1744 { 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	1745 { 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	1746 }
1755 841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1747 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1748 NULL
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1749 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1750
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	1751 {
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	1752 "mil", "Micro Illustrator (unpacked)", 0x18dc, 10022, DM_FMT_RDWR \| DM_FMT_BROKEN,
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	1753 fmtProbeMicroIllustrator,
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1754 NULL, NULL,
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1755 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1756 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1757 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1758 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1759 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1760 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1761 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1762 {
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	1763 { DO_COPY , DS_SCREEN_RAM , 20 + 0 , 0, 0, 0, NULL, NULL },
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	1764 { DO_COPY , DS_COLOR_RAM , 20 + 1000 , 0, 0, 0, NULL, NULL },
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	1765 { DO_COPY , DS_BITMAP_RAM , 20 + 2000 , 0, 0, 0, NULL, NULL },
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	1766 // XXX TODO: Unknown where the background color is set, so default to 0x00
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	1767 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL },
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	1768 { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtEncodeMicroIllustrator },
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	1769 { 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	1770 }
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1771 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1772 NULL
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1773 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1774
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	1775 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1776 "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	1777 NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1778 NULL, NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1779 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1780 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1781 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1782 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1783 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1784 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1785 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1786 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1787 { 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	1788 { 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	1789 { 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	1790 { 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	1791 { 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	1792 }
1754 aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1793 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1794 NULL
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1795 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1796
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	1797 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1798 "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	1799 NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1800 NULL, NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1801 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1802 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1803 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1804 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1805 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1806 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1807 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1808 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1809 { 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	1810 { 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	1811 { 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	1812 // 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	1813 { 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	1814 { 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	1815 }
1763 847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1816 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1817 NULL
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1818 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1819
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	1820 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1821 "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	1822 fmtProbeSaracenPaint,
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1823 NULL, NULL,
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1824 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1825 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1826 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1827 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1828 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1829 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1830 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1831 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1832 { 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	1833 { 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	1834 { 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	1835 { 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	1836 { 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	1837 }
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1838 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1839 NULL
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1840 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1841
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	1842 {
1980 2cf79254b8e4 Confirm the Blazing Paddles d020/bgcolor positions and remove the broken flag. Matti Hamalainen <ccr@tnsp.org> parents: 1979 diff changeset	1843 "blp", "Blazing Paddles (unpacked)", 0xA000, 10242, DM_FMT_RDWR,
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1844 NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1845 NULL, NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1846 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1847 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1848 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1849 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1850 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1851 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1852 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1853 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1854 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
1980 2cf79254b8e4 Confirm the Blazing Paddles d020/bgcolor positions and remove the broken flag. Matti Hamalainen <ccr@tnsp.org> parents: 1979 diff changeset	1855 // Both d020 and bgcolor confirmed by tests
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1856 { 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	1857 { 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	1858 { 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	1859 { 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	1860 { 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	1861 }
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1862 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1863 NULL
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1864 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1865
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	1866 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1867 "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	1868 NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1869 NULL, NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1870 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1871 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1872 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1873 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1874 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1875 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1876 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1877 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1878 { 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	1879 { 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	1880 { DO_SET_MEM_LO , DS_D020 , 0x5f40 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL },
1982 6af47b1009ba Use DO_SET_MEM_LO where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1980 diff changeset	1881 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x5f43 + 0x72 - 0x4000, 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	1882 { 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	1883 { 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	1884 }
1762 b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1885 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1886 NULL
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1887 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1888
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	1889 {
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1890 "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	1891 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1892 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1893 {
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1894 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1895 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1896 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1897 2, 1,
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1898 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1899 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1900 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1901 { 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	1902 { 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	1903 { 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	1904 { 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	1905 { 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	1906 { 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	1907 }
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1908 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1909 NULL
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1910 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1911
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	1912 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1913 "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	1914 fmtProbeAmicaPaintPacked,
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	1915 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	1916 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1917 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1918
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1919 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1920 "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	1921 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1922 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	1923 { }, &dmC64CommonFormats[0]
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1924 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1925
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1926 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1927 "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	1928 NULL,
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1929 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	1930 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1931 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1932
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1933 {
1819 c12bd223000e Enable write support for some formats that should be workable. Matti Hamalainen <ccr@tnsp.org> parents: 1816 diff changeset	1934 "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	1935 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1936 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	1937 { }, &dmC64CommonFormats[2]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1938 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1939
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1940 {
1819 c12bd223000e Enable write support for some formats that should be workable. Matti Hamalainen <ccr@tnsp.org> parents: 1816 diff changeset	1941 "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	1942 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1943 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1944 { }, &dmC64CommonFormats[2]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1945 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1946
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1947 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1948 "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	1949 fmtProbeDoodle,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1950 NULL, NULL,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1951 { }, &dmC64CommonFormats[10]
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1952 },
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1953
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1954 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1955 "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	1956 fmtProbeDoodle,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1957 fmtDecodeStaticRLEMarkerMode2, fmtEncodeStaticRLEMarkerMode2,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1958 { }, &dmC64CommonFormats[10]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1959 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1960
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1961 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1962 "mon", "Monomagic (unpacked)", 0x2000, 8194, DM_FMT_RDWR,
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1963 NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1964 NULL, NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1965 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1966 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1967 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1968 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1969 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1970 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1971 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1972 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1973 { 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	1974 { 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	1975 // 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	1976 { 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	1977 }
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1978 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1979 NULL
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1980 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1981
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	1982 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1983 "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	1984 NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1985 NULL, NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1986 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1987 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1988 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1989 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	1990 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1991 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1992 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1993 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	1994 { 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	1995 { 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	1996 { 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	1997 }
1671 dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1998 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	1999 NULL
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2000 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2001
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2002 {
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2003 "gih", "Gigapaint hires (unpacked)", 0x6000, 8002, DM_FMT_RDWR,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2004 fmtProbeGigapaintHires,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2005 NULL, NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2006 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2007 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2008 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2009 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2010 1, 1,
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2011 NULL, NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2012 NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2013 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2014 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2015 { DO_SET_OP , DS_SCREEN_RAM , 0x0F , 0, 0, 0, NULL, NULL },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2016 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2017 }
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2018 },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2019 NULL
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2020 },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2021
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2022 {
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	2023 "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	2024 NULL,
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	2025 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	2026 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2027 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2028 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT * 2,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2029 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2030 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2031 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2032 fmtGetPixelBFLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2033 {
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	2034 { 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	2035 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	2036 { 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	2037 DEF_SCREEN_RAMS_8(0x4401, 8, 0x400, 0x400),
5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	2038 { 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	2039 { 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	2040 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2041 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2042 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	2043 },
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	2044
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	2045 {
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2046 "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	2047 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2048 NULL, NULL,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2049 { }, &dmC64CommonFormats[1]
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2050 },
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2051
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2052 {
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	2053 "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	2054 fmtProbeBlackMailFLIPacked,
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	2055 fmtDecodeBlackMailFLIPacked, fmtEncodeBlackMailFLIPacked,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2056 { }, &dmC64CommonFormats[1]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2057 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2058
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2059 {
2014 a49f7e83edcb Fix FBI FLI Designer format names to match v1.x and v2. Matti Hamalainen <ccr@tnsp.org> parents: 1985 diff changeset	2060 "fd1", "FBI Crew FLI Designer 1.1 (unpacked)", 0x3c00, 17409, DM_FMT_RDWR,
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2061 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	2062 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	2063 { }, &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	2064 },
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	2065
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	2066 {
2014 a49f7e83edcb Fix FBI FLI Designer format names to match v1.x and v2. Matti Hamalainen <ccr@tnsp.org> parents: 1985 diff changeset	2067 "fd2", "FLI Designer 2 (unpacked)", 0x3ff0, 17409, DM_FMT_RDWR,
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	2068 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	2069 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	2070 { }, &dmC64CommonFormats[9]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2071 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2072
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2073 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2074 "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	2075 NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2076 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	2077 { }, &dmC64CommonFormats[7]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2078 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2079
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2080 {
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2081 "ecp", "ECI Graphic Editor 1.0 (packed)", 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	2082 fmtProbeECIPacked,
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2083 fmtDecodeECIPacked, fmtEncodeECIPacked,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2084 { }, &dmC64CommonFormats[7]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2085 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2086
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2087 {
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2088 "fpt", "Face Painter (unpacked)", 0x4000, 10004, DM_FMT_RDWR,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2089 NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2090 NULL, NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2091 { // Almost same layout as Koala Painter, but FPT has D020
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2092 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2093 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2094 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2095 2, 1,
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2096 NULL, NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2097 NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2098 {
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2099 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2100 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2101 { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, 0, NULL, NULL },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2102 { DO_SET_MEM_LO , DS_BGCOL , 0x2710, 0, 0, 0, NULL, NULL },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2103 { DO_SET_MEM_LO , DS_D020 , 0x2711, 0, 0, 0, NULL, NULL },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2104 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2105 }
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2106 },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2107 NULL
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2108 },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2109
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2110 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2111 "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	2112 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2113 NULL, NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2114 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2115 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2116 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2117 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2118 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2119 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2120 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2121 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	2122 { 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	2123 { 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	2124 { 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	2125 { 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	2126 { 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	2127 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2128 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2129 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2130 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2131
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2132 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2133 "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	2134 fmtProbeFormatXX2,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2135 fmtDecodeFormatXX2, NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2136 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2137 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	2138 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	2139 XX2_WIDTH_CH , XX2_HEIGHT_CH,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2140 2, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2141 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2142 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2143 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	2144 { 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	2145 { 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	2146 { 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	2147 { 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	2148 { 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	2149 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2150 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2151 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2152 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2153
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2154 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2155 "fp2", "FunPaint II (unpacked)", 0x3ff0, 33694, DM_FMT_RDWR,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2156 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2157 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	2158 { }, &dmC64CommonFormats[3]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2159 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2160
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2161 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2162 "fp2p", "FunPaint II (packed)", 0x3ff0, 0, DM_FMT_RDWR,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2163 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2164 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	2165 { }, &dmC64CommonFormats[3]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2166 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2167
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2168 {
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	2169 "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	2170 fmtProbeGunPaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2171 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2172 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2173 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2174 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2175 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2176 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2177 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2178 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	2179 {
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	2180 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	2181 { 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	2182 { 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	2183 { 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	2184 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	2185 { 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	2186 // 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	2187 // 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	2188 { DO_SET_MEM , DS_EXTRA_DATA , 0 , 0, 3 , 20+177, NULL, NULL },
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1915 diff changeset	2189 { DO_FUNC , 0 , 0x2742, 0, 1 , 0, fmtTruePaintGetLaceType, NULL },
3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1915 diff changeset	2190 { DO_FUNC , 0 , fmtGunPaintMagicOffs, 0, fmtGunPaintMagicLen, 0, NULL, fmtEncodeGunPaint },
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	2191 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL },
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2192 }
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2193 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2194 NULL
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2195 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2196
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2197 {
1877 f8b7baf3ff89 Some fixes to HCB support, now the background colors are supported correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1876 diff changeset	2198 "hcb", "Half Char Bitmap (unpacked)", 0x5000, 12148, DM_FMT_RDWR,
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2199 NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2200 NULL, NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2201 {
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2202 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2203 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2204 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2205 2, 1,
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2206 NULL, NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2207 fmtGetPixelHCB,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2208 {
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2209 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2210 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2211 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2212 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2213 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL },
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2214 { DO_COPY , DS_EXTRA_DATA , 0x2f40, 0, D64_SCR_HEIGHT / 4, 0, NULL, NULL },
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2215 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2216 }
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2217 },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2218 NULL
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2219 },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2220
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2221 {
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	2222 "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	2223 NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2224 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2225 {
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2226 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2227 192, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2228 24, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2229 2, 1,
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2230 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2231 fmtGetPixelPentelPaint,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2232 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	2233 { 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	2234 { 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	2235 { 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	2236 { DO_SET_MEM_LO , DS_D022 , 0x9581 - 0x4800, 0, 0, 0, NULL, NULL }, // Sprite color
1982 6af47b1009ba Use DO_SET_MEM_LO where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1980 diff changeset	2237 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x9582 - 0x4800, 0, 0, 0, NULL, NULL },
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2238 { DO_COPY , DS_EXTRA_DATA , 0x5ac0 - 0x4800, 0, D64_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	2239 { 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	2240 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2241 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2242 NULL
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2243 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2244
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2245 {
1879 3b2f755c5745 Allow writing of "Crest Hires FLI Designer (unpacked)" and "Cosmos Designs Hires Manager (unpacked)" formats. Matti Hamalainen <ccr@tnsp.org> parents: 1878 diff changeset	2246 "chid", "Crest Hires FLI Designer (unpacked)", 0x4000, 16386, DM_FMT_RDWR,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2247 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2248 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2249 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2250 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2251 D64_SCR_WIDTH, D64_SCR_HEIGHT, // Actually 296 x 112 (=14*8)
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2252 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
2056 c27ed6465022 Add pixel aspect ratio information for C64 formats. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 2033 diff changeset	2253 1, 1,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2254 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2255 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2256 {
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1845 diff changeset	2257 { 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	2258 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	2259 { 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	2260 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2261 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2262 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2263 },
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2264
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2265 {
1879 3b2f755c5745 Allow writing of "Crest Hires FLI Designer (unpacked)" and "Cosmos Designs Hires Manager (unpacked)" formats. Matti Hamalainen <ccr@tnsp.org> parents: 1878 diff changeset	2266 "cdhm", "Cosmos Designs Hires Manager (unpacked)", 0x4000, 16385, DM_FMT_RDWR,
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2267 fmtProbeCosmosDesignsHiresManager,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2268 NULL, NULL,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2269 { }, &dmC64CommonFormats[8]
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2270 },
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2271
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2272 {
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2273 "cdhp", "Cosmos Designs Hires Manager (packed)", 0x4000, 0, DM_FMT_RD \| DM_FMT_BROKEN,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2274 fmtProbeCosmosDesignsHiresManager,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2275 fmtDecodeCosmosDesignsHiresManagerPacked, NULL,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2276 { }, &dmC64CommonFormats[8]
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2277 },
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2278
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2279 {
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2280 "mrqp", "Marq's PETSCII editor (unpacked)", 0x0801, 0, DM_FMT_RD,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2281 fmtProbeMarqPETSCII,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2282 NULL, NULL,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2283 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2284 D64_FMT_HIRES \| D64_FMT_CHAR,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2285 D64_SCR_WIDTH , D64_SCR_HEIGHT,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2286 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2287 1, 1,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2288 NULL, NULL,
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2289 fmtGetPixelPETSCII,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2290 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2291 { DO_COPY , DS_SCREEN_RAM , 0x60, 0, 0, 0, NULL, NULL },
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2292 { DO_COPY , DS_COLOR_RAM , 0x60 + 1000, 0, 0, 0, NULL, NULL },
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2293
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	2294 // For offset values see petscii/m_c64.pde :: save_prg()
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	2295 { DO_SET_MEM_LO , DS_D020 , 25 - 2, 0, 0, 0, NULL, NULL },
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	2296 { DO_SET_MEM_LO , DS_BGCOL , 30 - 2, 0, 0, 0, NULL, NULL },
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2297 { DO_COPY , DS_EXTRA_DATA , 20 - 2, 0, 1, 0, NULL, NULL },
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2298 { DO_FUNC , 0 , 0 , 0, 0, 0, fmtSetMarqPETSCIIData, NULL },
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2299
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	2300 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2301 }
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2302 },
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2303 NULL
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2304 },
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2305
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2306 {
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2307 "pkhu", "petscii.krissz.hu editor (unpacked)", 0x0801, 0, DM_FMT_RD,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2308 fmtProbePetsciiKrisszHu,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2309 NULL, NULL,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2310 {
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2311 D64_FMT_CHAR,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2312 D64_SCR_WIDTH , D64_SCR_HEIGHT,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2313 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2314 1, 1,
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2315 NULL, NULL,
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2316 fmtGetPixelPETSCII,
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2317 {
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2318 { DO_COPY , DS_SCREEN_RAM , 0x2001 - 2, 0, 0, 0, NULL, NULL },
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2319 { DO_COPY , DS_COLOR_RAM , 0x23e9 - 2, 0, 0, 0, NULL, NULL },
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2320
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2321 { DO_COPY , DS_EXTRA_DATA , 0x0000 , 0, 0x0100, 0, NULL, NULL },
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2322 { DO_COPY , DS_CHAR_DATA , 0x1801 - 2, 0, 0x0800, 0, NULL, NULL },
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2323 { DO_FUNC , 0 , 0 , 0, 0 , 0, fmtSetPetsciiKrisszHuData, NULL },
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2324
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2325 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL },
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2326 }
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2327 },
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2328 NULL
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2329 },
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2330 };
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2331
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2332 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	2333

Mercurial > hg > dmlib

annotate tools/lib64fmts.c @ 2149:810fc98d9003