dmlib: tools/lib64fmts.c annotate

annotate tools/lib64fmts.c @ 2428:09082816665d

Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 31 Jan 2020 21:48:45 +0200
parents	5d391c31ebc9
children	4dbb6572622d

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
2371 82cb32297ed2 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 2368 diff changeset	5 * (C) Copyright 2012-2020 Tecnic Software productions (TNSP)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 *
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 * Please read file 'COPYING' for information on license and distribution.
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 */
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "lib64gfx.h"
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10
2080 7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	11 #define DM_MEMCMP_SIZE(mptr, mcmp) memcmp((mptr), (mcmp), sizeof(mcmp))
7e4087e2740d Define macros DM_MEMCMP_SIZE() and DM_MEMCMP_LEN() as helpers. Matti Hamalainen <ccr@tnsp.org> parents: 2056 diff changeset	12 #define DM_MEMCMP_LEN(mptr, mcmp) memcmp((mptr), (mcmp), strlen(mcmp))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13
2301 d71185584d95 Comment the necessity of fmtProbeGigapaintHires().. Matti Hamalainen <ccr@tnsp.org> parents: 2300 diff changeset	14
d71185584d95 Comment the necessity of fmtProbeGigapaintHires().. Matti Hamalainen <ccr@tnsp.org> parents: 2300 diff changeset	15 // Basic probe, but return MAX score for this format
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	16 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	17 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	18 if (buf->len == fmt->size &&
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	19 dmCompareAddr16(buf, 0, fmt->addr))
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	20 return DM_PROBE_SCORE_MAX;
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 return DM_PROBE_SCORE_FALSE;
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	23 }
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	24
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	26 // 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	27 // 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	28 // before actual image data, but do not seem to be used in the image itself.
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	29 static const Uint8 fmtMicroIllustrator_MagicID_1[] =
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	30 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	31 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	32 };
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	33
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	34 static const Uint8 fmtMicroIllustrator_MagicID_2[] =
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	35 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	36 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	37 };
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 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	40 {
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	41 if (buf->len == fmt->size &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	42 DM_MEMCMP_SIZE(buf->data + 2, fmtMicroIllustrator_MagicID_1) == 0
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	43 &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	44 DM_MEMCMP_SIZE(buf->data + 9, fmtMicroIllustrator_MagicID_2) == 0
1983 214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	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_MAX;
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 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	49 }
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	50
214c7bd8692f Rename "MIL" to "Micro Illustrator" and improve probing of that format, at Matti Hamalainen <ccr@tnsp.org> parents: 1982 diff changeset	51
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	52 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	53 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	54 {
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) op;
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	56 (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	57 (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	58
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	59 memcpy(buf->data + 2, fmtMicroIllustrator_MagicID_1, sizeof(fmtMicroIllustrator_MagicID_1));
4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	60 memcpy(buf->data + 9, fmtMicroIllustrator_MagicID_2, sizeof(fmtMicroIllustrator_MagicID_2));
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	61
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	62 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	63 }
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	64
5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	65
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	66 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	67 {
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	68 0x01, 0x08, 0x0b, 0x08, 0xef, 0x00, 0x9e, 0x32, 0x30, 0x36,
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	69 0x31, 0x00, 0x00, 0x00, 0xa9, 0x0b, 0x8d, 0x11, 0xd0,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	70 };
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	71
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	72 static const Uint8 fmtMarqPETSCII_ID2[] =
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	73 {
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	74 0xa9, 0x00, 0x8d, 0x18, 0xd0, // lda #? : sta $d018
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	75 0xa9, 0x00, 0x8d, 0x20, 0xd0, // lda #? : sta $d020
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	76 0xa9, 0x00, 0x8d, 0x21, 0xd0, // lda #? : sta $d021
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	77 };
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	78
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	79 static const Uint8 fmtMarqPETSCII_ID3[] =
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	80 {
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	81 0xa2, 0x00, 0xa0, 0xfa, 0xbd, 0x61,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	82 0x08, 0x9d, 0x00, 0x04, 0xbd, 0x5b, 0x09, 0x9d, 0xfa, 0x04,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	83 0xbd, 0x55, 0x0a, 0x9d, 0xf4, 0x05, 0xbd, 0x4f, 0x0b, 0x9d,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	84 0xee, 0x06, 0xbd, 0x49, 0x0c, 0x9d, 0x00, 0xd8, 0xbd, 0x43,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	85 0x0d, 0x9d, 0xfa, 0xd8, 0xbd, 0x3d, 0x0e, 0x9d, 0xf4, 0xd9,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	86 0xbd, 0x37, 0x0f, 0x9d, 0xee, 0xda, 0xe8, 0x88, 0xd0, 0xcc,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	87 0xa9, 0x1b, 0x8d, 0x11, 0xd0, 0x4c, 0x5e, 0x08,
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	88 };
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	89
5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	90
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	91 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	92 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	93 (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	94
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	95 if (buf->len == 2098 &&
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	96 DM_MEMCMP_SIZE(buf->data, fmtMarqPETSCII_ID1) == 0 &&
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	97 DM_MEMCMP_SIZE(buf->data + sizeof(fmtMarqPETSCII_ID1) +
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	98 sizeof(fmtMarqPETSCII_ID2), fmtMarqPETSCII_ID3) == 0
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	99 )
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	100 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	101
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	102 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	103 }
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	104
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	105
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	106 static int fmtDecodeHiresPETSCIICharsetData(const DMC64EncDecOp op, DMC64Image img,
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	107 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	108 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	109 (void) fmt;
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	110 Uint8 val;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	111
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	112 switch (buf->data[op->offs])
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	113 {
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	114 case 0x14: val = 0; break; // upper case
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	115 case 0x17: val = 1; break; // lower case
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	116 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	117 return DMERR_INVALID_DATA;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	118 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	119
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	120 img->extraInfo[D64_EI_CHAR_CASE] = val;
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	121 img->extraInfo[D64_EI_MODE] = D64_FMT_HIRES \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	122 img->extraInfo[D64_EI_CHAR_CUSTOM] = 0;
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 return DMERR_OK;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	125 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	126
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	127
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	128 static int fmtEncodeHiresPETSCIICharsetData(
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	129 const DMC64EncDecOp op, DMGrowBuf buf, const DMC64Image *img,
09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	130 const DMC64ImageCommonFormat *fmt)
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	131 {
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	132 Uint8 val;
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	133 (void) fmt;
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	134
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	135 switch (img->extraInfo[D64_EI_CHAR_CASE])
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	136 {
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	137 case 0: val = 0x14; break;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	138 case 1: val = 0x17; break;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	139 default: return DMERR_INVALID_DATA;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	140 }
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	141
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	142 buf->data[op->offs + 2] = val;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	143
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	144 return DMERR_OK;
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	145 }
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	146
4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	147
2366 1e6e018b6487 Rename some functions to be more consistent with their intent. Matti Hamalainen <ccr@tnsp.org> parents: 2363 diff changeset	148 static int fmtEncodeMarqPETSCIIData(const DMC64EncDecOp op, DMGrowBuf buf,
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	149 const DMC64Image img, const DMC64ImageCommonFormat fmt)
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	150 {
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	151 memcpy(buf->data,
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	152 fmtMarqPETSCII_ID1, sizeof(fmtMarqPETSCII_ID1));
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	153
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	154 memcpy(buf->data + sizeof(fmtMarqPETSCII_ID1),
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	155 fmtMarqPETSCII_ID2, sizeof(fmtMarqPETSCII_ID2));
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	156
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	157 memcpy(buf->data + sizeof(fmtMarqPETSCII_ID1) + sizeof(fmtMarqPETSCII_ID2),
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	158 fmtMarqPETSCII_ID3, sizeof(fmtMarqPETSCII_ID3));
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	159
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	160 return fmtEncodeHiresPETSCIICharsetData(op, buf, img, fmt);
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	161 }
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	162
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	163
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	164 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	165 {
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 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	167 0x31, 0x00, 0x00, 0x00, 0xA9,
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	168 };
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	169
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	170 static const Uint8 fmtPetsciiKrisszHu_ID2[] =
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	171 {
fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	172 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	173 };
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
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 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	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 (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	179
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	180 if (buf->len == 10193 &&
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	181 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	182 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	183 )
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	184 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	185
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	186 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	187 }
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	188
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	189
2366 1e6e018b6487 Rename some functions to be more consistent with their intent. Matti Hamalainen <ccr@tnsp.org> parents: 2363 diff changeset	190 static int fmtDecodePetsciiKrisszHuData(const DMC64EncDecOp op, DMC64Image img,
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	191 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	192 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	193 (void) op;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	194 (void) buf;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	195 (void) fmt;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	196
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	197 const Uint8 *data = img->extraData[0].data;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	198 switch (data[0x0028 - 2])
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	199 {
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	200 case 0x00:
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	201 img->extraInfo[D64_EI_MODE] = D64_FMT_HIRES \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	202 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	203 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	204 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	205
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	206 case 0xd8:
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	207 img->extraInfo[D64_EI_MODE] = D64_FMT_MC \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	208 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	209 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	210 img->d022 = data[0x002d - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	211 img->d023 = data[0x0032 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	212 break;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	213
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	214 case 0x01:
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	215 img->extraInfo[D64_EI_MODE] = D64_FMT_ECM \| D64_FMT_CHAR;
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	216 img->d020 = data[0x001e - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	217 img->bgcolor = data[0x0023 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	218 img->d022 = data[0x0028 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	219 img->d023 = data[0x002d - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	220 img->d024 = data[0x0032 - 2];
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	221 break;
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 default:
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	224 return DMERR_INVALID_DATA;
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
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	227 // 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	228 // 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	229 // 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	230 // implement a hash-based detection at some point.
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	231 img->extraInfo[D64_EI_CHAR_CASE] = 0;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	232 img->extraInfo[D64_EI_CHAR_CUSTOM] = 1;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	233
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	234 return DMERR_OK;
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	235 }
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	236
84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	237
2377 d8889ff223b6 UPETSCII is actually old version of Marq's PETSCII editor. Matti Hamalainen <ccr@tnsp.org> parents: 2371 diff changeset	238 static int fmtDecodeMarqOldData(const DMC64EncDecOp op, DMC64Image img,
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	239 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	240 {
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	241 (void) op;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	242 (void) buf;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	243 (void) fmt;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	244
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	245 img->extraInfo[D64_EI_MODE] = D64_FMT_HIRES \| D64_FMT_CHAR;
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	246 img->extraInfo[D64_EI_CHAR_CUSTOM] = 0;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	247
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	248 return DMERR_OK;
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	249 }
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	250
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	251
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	252 static const Uint8 fmtCocaPETSCII_ID1[] =
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	253 {
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	254 0x01, 0x08, 0x0b, 0x08, 0x0a, 0x00, 0x9e, 0x32, 0x30, 0x36,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	255 0x31, 0x00, 0x00, 0x00, 0x78, 0xa2, 0x00, 0xbd, 0x5a, 0x08,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	256 0x9d, 0x00, 0x04, 0xbd, 0x5a, 0x09, 0x9d, 0x00, 0x05, 0xbd,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	257 0x5a, 0x0a, 0x9d, 0x00, 0x06, 0xbd, 0x5a, 0x0b, 0x9d, 0x00,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	258 0x07, 0xbd, 0x5a, 0x0c, 0x9d, 0x00, 0xd8, 0xbd, 0x5a, 0x0d,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	259 0x9d, 0x00, 0xd9, 0xbd, 0x5a, 0x0e, 0x9d, 0x00, 0xda, 0xbd,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	260 0x5a, 0x0f, 0x9d, 0x00, 0xdb, 0xe8, 0xd0, 0xcd, 0xad, 0x42,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	261 0x0c, 0x8d, 0x20, 0xd0, 0xad, 0x43, 0x0c, 0x8d, 0x21, 0xd0,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	262 0xad, 0x44, 0x0c, 0x8d, 0x18, 0xd0, 0x4c, 0x55, 0x08
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	263 };
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	264
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	265
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	266 static int fmtProbeCocaPETSCII(const DMGrowBuf buf, const DMC64ImageFormat fmt)
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	267 {
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	268 (void) fmt;
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	269
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	270 if (buf->len == 2115 &&
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	271 DM_MEMCMP_SIZE(buf->data, fmtCocaPETSCII_ID1) == 0 &&
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	272 buf->data[0x0c44 - 0x0801 + 2] == 0x14)
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	273 return DM_PROBE_SCORE_MAX;
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	274
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	275 return DM_PROBE_SCORE_FALSE;
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	276 }
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	277
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	278
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	279 static int fmtEncodeCocaPETSCIIData(const DMC64EncDecOp op, DMGrowBuf buf,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	280 const DMC64Image img, const DMC64ImageCommonFormat fmt)
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	281 {
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	282 memcpy(buf->data,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	283 fmtCocaPETSCII_ID1, sizeof(fmtCocaPETSCII_ID1));
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	284
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	285 return fmtEncodeHiresPETSCIICharsetData(op, buf, img, fmt);
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	286 }
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	287
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	288
2015 c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	289 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	290 {
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	291 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	292
2112 9dc2976e9fa3 Improve probing of packed and unpacked Koala files. Many converters and Matti Hamalainen <ccr@tnsp.org> parents: 2080 diff changeset	293 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	294 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	295 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	296
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	297 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	298 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	299
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	300 return score;
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	301 }
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	302
c5a88bb4ee3f Improve unpacked Koala Painter format support for variants that have a Matti Hamalainen <ccr@tnsp.org> parents: 2014 diff changeset	303
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	304 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	305 {
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	306 // 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	307 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	308 buf->len < 10002 &&
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	309 dmCompareAddr16(buf, 0, fmt->addr))
1771 c261db6e39aa Adjust some probe scores. Matti Hamalainen <ccr@tnsp.org> parents: 1770 diff changeset	310 return DM_PROBE_SCORE_GOOD;
1594 afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	311
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	312 return DM_PROBE_SCORE_FALSE;
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	313 }
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	314
afb49736615a Implement packed Koala Painter probing. Matti Hamalainen <ccr@tnsp.org> parents: 1593 diff changeset	315
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	316 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	317 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	318 if (buf->len > 32 &&
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	319 (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	320 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	321 // 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	322 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	323 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	324 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	325 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	326
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	327 // Unpacked variant
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	328 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	329 return DM_PROBE_SCORE_MAX;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	330 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	331
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	332 return DM_PROBE_SCORE_FALSE;
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	333 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	334
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	335
2161 6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	336 static int fmtProbeArtStudio(const DMGrowBuf buf, const DMC64ImageFormat fmt)
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	337 {
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	338 if ((buf->len == fmt->size \|\| buf->len == 9002) &&
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	339 dmCompareAddr16(buf, 0, 0x2000))
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	340 return DM_PROBE_SCORE_MAX;
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	341
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	342 return DM_PROBE_SCORE_FALSE;
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	343 }
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	344
6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	345
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	346 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	347 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	348 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	349 DMGrowBuf mem;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	350 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	351
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	352 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	353 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	354 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	355 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	356
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	357 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	358 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	359
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	360 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	361
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	362 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	363 dmGrowBufFree(&mem);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	364 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	365 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	366
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	367
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	368 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	369 {
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	370 int res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	371 DMGrowBuf tmp;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	372 DMCompParams cfg;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	373
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	374 // 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	375 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	376 goto out;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	377
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	378 // 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	379 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	380 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	381 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	382 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	383 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	384 cfg.rleMaxCountB = 255;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	385 res = dmEncodeGenericRLE(buf, &tmp, &cfg);
1578 fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	386
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	387 out:
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	388 dmGrowBufFree(&tmp);
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	389 return res;
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	390 }
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	391
fb60abb09a65 Add support for packed Koala Painter files, though without probing now. Matti Hamalainen <ccr@tnsp.org> parents: 1577 diff changeset	392
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	393 static int 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	394 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	395 const Uint8 *ident = buf->data + 2;
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	396 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	397 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	398 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	399 ident[11] == '.' && (
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 (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	401 (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	402 ))
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 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	404
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 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	406 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	409 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	410 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	412 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	413 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414
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	415 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	416 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	417 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	418 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	419
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	420 if ((res = dmDecodeGenericRLEAlloc(&mem,
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	421 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	422 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	424 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	425
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 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	433 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 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	436 DMCompParams cfg;
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2238 diff changeset	437 const char *magicID = (fmt->format->mode & D64_FMT_ILACE) ? "DRAZLACE! 1.0" : "DRAZPAINT 2.0";
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 // 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	440 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	441 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442
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	443 // 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	444 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	445 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	446 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	447 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	448 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	450 if ((res = dmGenericRLEAnalyze(&tmp, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	451 goto out;
1661 dc3fbd130db7 RLE analyze was ran before setting up the compression config. Oops. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	452
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453 // 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	454 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	455 !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	456 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	458 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 // 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	462 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	463
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	470 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	471 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	472 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	473 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	474 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	475 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	476
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 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	478 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	481 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	482 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	483 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 (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	485
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	486 img->extraInfo[D64_EI_ILACE_TYPE] = buf->data[op->offs] ? D64_ILACE_RES : D64_ILACE_COLOR;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	487 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	491 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	492 const DMC64Image img, const DMC64ImageCommonFormat fmt)
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	493 {
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	494 (void) fmt;
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	495 buf->data[op->offs] = (img->extraInfo[D64_EI_ILACE_TYPE] == D64_ILACE_RES) ? 1 : 0;
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	496 return DMERR_OK;
1535 2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	497 }
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	498
2f7ff28ea56e Fix DrazLace encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1529 diff changeset	499
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	500 static int fmtGetPixelDrazLace(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	501 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	502 {
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	503 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	504 (void) vshift;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	505
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	506 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	507 bmoffs, scroffs,
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	508 6 - (rasterX & 6), 0,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	509 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	510 }
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	511
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	512
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	513 static const char *fmtBDP5_MagicID = "BDP 5.00";
1662 34d7c708649e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1661 diff changeset	514
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	515 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	516 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	517 if (buf->len > 20 &&
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	518 dmCompareAddr16(buf, 0, fmt->addr) &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	519 DM_MEMCMP_LEN(buf->data + 2, fmtBDP5_MagicID) == 0)
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	520 return DM_PROBE_SCORE_MAX;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	521
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	522 return DM_PROBE_SCORE_FALSE;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	523 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	524
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	525
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	526 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	527 {
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	528 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	529 DMGrowBuf mem, tmp;
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	530 DMCompParams cfg;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	531
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	532 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	533 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	534 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	535 cfg.rleMarkerB = buf->data[8];
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	536 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	537
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	538 // 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	539 // 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	540 // 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	541 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	542 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	543
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	544 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	545
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	546 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	547 goto out;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	548
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	549 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	550
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	551 out:
1792 905c09049fe6 Oops, forgot to free the buffer allocated in the BDP5 decoder. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1791 diff changeset	552 dmGrowBufFree(&tmp);
1651 6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	553 dmGrowBufFree(&mem);
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	554 return res;
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	555 }
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	556
6dd191d04ea8 Implement support for Boogie Down Paint 5 (packed) format. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	557
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	558 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	559 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	560 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	561 DMGrowBuf mem;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	562 DMCompParams cfg;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	563
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	564 // 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	565 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	566 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	567
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	568 // 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	569 cfg.func = fmt->name;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	570 cfg.type = DM_COMP_RLE_MARKER;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	571 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	572 cfg.rleMinCountB = 4;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	573 cfg.rleMaxCountB = 255;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	574 cfg.rleMinCountW = 256;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	575 cfg.rleMaxCountW = 1024;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	576
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	577 if ((res = dmGenericRLEAnalyze(&mem, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	578 goto out;
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	579
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	580 // Add the header bits
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	581 if (!dmGrowBufPut(buf, (Uint8 *) fmtBDP5_MagicID, strlen(fmtBDP5_MagicID)) \|\|
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	582 !dmGrowBufPutU8(buf, cfg.rleMarkerB) \|\|
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	583 !dmGrowBufPutU8(buf, cfg.rleMarkerW))
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	584 {
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	585 res = DMERR_MALLOC;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	586 goto out;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	587 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	588
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	589 // 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	590 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	591
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	592 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	593 dmGrowBufFree(&mem);
1663 8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	594 return res;
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	595 }
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	596
8ae32df3c184 Add support for BDP5 format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1662 diff changeset	597
2185 6ba6ca5632d2 Make GunPaint v1.1 writing more accurate. Matti Hamalainen <ccr@tnsp.org> parents: 2178 diff changeset	598 static const char *fmtGunPaint_MagicID = "GUNPAINT (JZ) ";
6ba6ca5632d2 Make GunPaint v1.1 writing more accurate. Matti Hamalainen <ccr@tnsp.org> parents: 2178 diff changeset	599 #define fmtGunPaint_MagicLen (16)
6ba6ca5632d2 Make GunPaint v1.1 writing more accurate. Matti Hamalainen <ccr@tnsp.org> parents: 2178 diff changeset	600 #define fmtGunPaint_MagicOffs (0x03e8)
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	601
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	602 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	603 {
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	604 if (buf->len > fmtGunPaint_MagicOffs + fmtGunPaint_MagicLen &&
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 dmCompareAddr16(buf, 0, fmt->addr) &&
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	606 memcmp(buf->data + fmtGunPaint_MagicOffs + 2, fmtGunPaint_MagicID, fmtGunPaint_MagicLen) == 0)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 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	608
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 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	610 }
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
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	613 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	614 const DMC64Image img, const DMC64ImageCommonFormat fmt)
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	615 {
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	616 (void) op;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	617 (void) img;
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	618 (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	619
1946 c30dfd5e3227 Add a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1941 diff changeset	620 // Here we assume that the op triggering this function is
c30dfd5e3227 Add a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1941 diff changeset	621 // at the end of the oplist, so the memory is allocated,
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	622 memcpy(buf->data + fmtGunPaint_MagicOffs + 2, fmtGunPaint_MagicID, fmtGunPaint_MagicLen);
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	623
27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	624 return DMERR_OK;
1776 aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	625 }
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	626
aa427e68e114 Theoretically fix Gun Paint format writing. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	627
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	628 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	629 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 size_t i, n;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	632 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	633 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	634
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 // 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	636 // as do some GunPaint images ..
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	637 if (buf->len == 9002 \|\|
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	638 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	639 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	640
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	641 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	642 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	643
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644 if (n > 50)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645 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	646 if (n > 25)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 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	648 if (n > 10)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 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	650
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 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	652 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	655 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	656 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 int res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 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	659 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 // 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	662 // 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	663 if (dmGrowBufCopy(&tmp, buf, 1) == NULL)
768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	664 return DMERR_MALLOC;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
1751 768fddda73e9 Convert fmtDecodeAmicaPaintPacked() to use the new DMGrowBuf functions. Matti Hamalainen <ccr@tnsp.org> parents: 1749 diff changeset	666 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	667
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 // 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	669 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	670 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	671 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	672 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	673
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	674 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	675 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 // 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	678 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	679
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680 out:
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 dmGrowBufFree(&tmp);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 dmGrowBufFree(&mem);
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	687 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	688 {
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	689 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	690 DMGrowBuf mem;
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	691 DMCompParams cfg;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	692
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	693 // 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	694 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	695 goto out;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	696
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	697 // 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	698 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	699 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	700 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	701 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	702 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	703 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	704
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	705 res = dmEncodeGenericRLE(buf, &mem, &cfg);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	706
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	707 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	708 dmGrowBufFree(&mem);
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	709 return res;
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	710 }
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	711
af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	712
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	713 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	714 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	715 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	716 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	717 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	718
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	719 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	720 }
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	721
5d7c89ad0bb4 Improve Saracen Paint support by adding a probe function that accounts for Matti Hamalainen <ccr@tnsp.org> parents: 1771 diff changeset	722
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	723 static int fmtGetPixelFLIDesigner(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	724 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	725 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	726 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	727
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	728 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	729 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	730 vshift, rasterY & 7,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	731 0, 0, img->bgcolor);
1806 dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	732 }
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	733
dcb12cd340d3 Add missing Pentel Paint getpixel function. Matti Hamalainen <ccr@tnsp.org> parents: 1805 diff changeset	734
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	735 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	736 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	737 if (buf->len > 16 &&
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	738 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	739 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	740 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	741 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	742
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	743 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	744 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	745
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	746
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	747 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	748 {
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	749 int res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	750 DMGrowBuf dst, src;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	751 DMCompParams cfg;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	752
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	753 cfg.func = fmt->name;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	754 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	755 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	756 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	757 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	758 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	759
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	760 // 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	761 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	762
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	763 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	764 goto out;
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 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	767
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	768 out:
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	769 dmGrowBufFree(&dst);
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	770 return res;
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	771 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	772
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	773
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	774 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	775 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	776 int res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	777 DMGrowBuf tmp1, tmp2;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	778 DMCompParams cfg;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	779
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	780 dmGrowBufInit(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	781 dmGrowBufInit(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	782
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	783 // 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	784 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	785 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	786
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	787 // 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	788 cfg.func = fmt->name;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	789 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	790 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	791 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	792 cfg.rleMinCountB = 4;
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	793 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	794
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	795 if ((res = dmGenericRLEAnalyze(&tmp1, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	796 goto out;
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	797
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	798 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	799 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	800
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	801 // 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	802 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	803 !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	804 !dmGrowBufPutU16LE(buf, 0x7f3f) \|\|
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	805 !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	806 {
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	807 res = DMERR_MALLOC;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	808 goto out;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	809 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	810
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	811 out:
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	812 dmGrowBufFree(&tmp1);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	813 dmGrowBufFree(&tmp2);
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	814 return res;
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	815 }
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	816
843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	817
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	818 static int fmtGetPixelBlackMailFLI(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	819 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	820 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	821 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	822
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	823 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	824 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	825
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	826 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	827 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	828 vshift, rasterY & 7,
2222 75b5bb490f38 Add & 15 to deeper helper functions and remove it from unnecessary places. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	829 0, 0, bgcol);
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	830 }
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	831
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	832
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	833 static int fmtGetPixelTruePaint(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	834 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	835 {
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	836 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	837 (void) vshift;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	838
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	839 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	840 bmoffs, scroffs,
2313 866e036d7706 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2311 diff changeset	841 6 - (rasterX & 6), 0,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	842 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	843 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	844
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	845
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	846 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	847 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	848 // 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	849 // relocation of decompression code
1684 e7990551c6d6 Rename function variable. Matti Hamalainen <ccr@tnsp.org> parents: 1671 diff changeset	850 static const Uint8 magicID[] = {
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	851 0x0b, 0x08, 0x09, 0x00, 0x9e, 0x32, 0x30, 0x35,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	852 0x39, 0x00, 0xa2, 0x00, 0x78, 0xbd, 0x1c, 0x08,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	853 0x9d, 0xf5, 0x00, 0xe8, 0xd0, 0xf7, 0xe6, 0x01,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	854 0x4c, 0x01, 0x01, 0xa5, 0xfe, 0xd0, 0x02, 0xc6,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	855 0xff, 0xc6, 0xfe
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	856 };
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	857
1789 9f5c5ab0e85e Adjust True Paint probing to be slightly more forgiving vs. file size. Matti Hamalainen <ccr@tnsp.org> parents: 1788 diff changeset	858 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	859 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	860 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	861 return DM_PROBE_SCORE_MAX;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	862
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	863 return DM_PROBE_SCORE_FALSE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	864 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	865
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	866
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 // 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	869 // 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	870 // simplistic "codebook".
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	871 //
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	872 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	873 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	874 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	875 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	876 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	877 "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	878 }
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	879 else
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	880 return DMERR_OK;
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
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	883
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	884 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	885 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	886 int res = DMERR_OK;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	887 const Uint8 codeBook1, codeBook2;
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	888 DMGrowBuf dst, src;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	889 DMCompParams cfg;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	890 Uint8 data;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	891
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	892 // 1b7e-67e8 decoded by original depacker
12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	893 // 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	894 cfg.func = fmt->name;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	895 cfg.type = DM_COMP_RLE_MARKER;
1724 12504f179749 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1723 diff changeset	896 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	897 cfg.rleMarkerB = 0xfe;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	898 cfg.cropOutLen = 0x67e8 - 0x1c00;
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 // 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	901 codeBook1 = psrc->data + 0x81 - 2;
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	902 codeBook2 = psrc->data + 0x85 - 2;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	903
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	904 // Allocate output buffer
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	905 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	906 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	907
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	908 // 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	909 // 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	910 dmGrowBufConstCopy(&src, psrc);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	911 dmSetupRLEBuffers(&dst, &src, &cfg);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	912
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	913 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	914 {
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	915 unsigned int count = 1;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	916 BOOL found = FALSE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	917
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	918 for (int n = 0; n < 8; n++)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	919 if (codeBook1[n] == data && !found)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	920 {
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	921 found = TRUE;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	922 switch (n)
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 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	925 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	926 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	927
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	928 count = data;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	929 if (data == 0)
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	930 goto finish;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	931
dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	932 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	933
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	934 case 1: // Y = 1, JTO = $17
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	935 count += 2;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	936 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	937
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	938 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	939 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	940 goto out;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	941 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	942
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	943 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	944 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	945 goto out;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	946
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	947 count = data;
1649 dbdff3d50a4e Clean up fmtDecodeTruePaintPacked() a bit, and fix GCC warnings about Matti Hamalainen <ccr@tnsp.org> parents: 1648 diff changeset	948 // fallthrough
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	949
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	950 case 3: // Y = 3, JTO = $0B
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	951 count += 2;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	952 data = 0;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	953 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	954
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	955 default: // Y = [5..8], JTO = $00
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	956 count++;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	957 data = codeBook2[n];
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	958 break;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	959 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	960 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	961
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	962 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	963 goto out;
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	964 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	965
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	966 finish:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	967 dmFinishRLEBuffers(&dst, &src, &cfg);
de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	968 res = dmC64DecodeGenericBMP(img, &dst, fmt);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	969
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	970 out:
1722 de8e0a404c06 Refactor fmtDecodeTruePaintPacked() to use more generic DMGrowBuf functions Matti Hamalainen <ccr@tnsp.org> parents: 1714 diff changeset	971 dmGrowBufFree(&dst);
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	972 return res;
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	973 }
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	974
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	975
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	976 static int fmtGetPixelFlinterlazer(DMC64ScanLine *scan,
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	977 const DMC64Image *img, const int rasterX, const int rasterY)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	978 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	979 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	980 const int vbank = rasterY & 7;
2302 7c26b5f86ff7 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 2301 diff changeset	981 Uint8 color1, color2, bgcol = img->bgcolor;
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	982 int res;
2300 a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	983
a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	984 if ((res = dmC64GetGenericMCPixel(&color1, img, bmoffs, scroffs, vshift, vbank , 0, 0, bgcol)) != DMERR_OK \|\|
a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	985 (res = dmC64GetGenericMCPixel(&color2, img, bmoffs, scroffs, vshift, vbank + 8, 1, 0, bgcol)) != DMERR_OK)
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	986 return res;
2300 a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	987
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	988 (scan->col) = (color1 D64_NCOLORS) + color2;
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	989 return DMERR_OK;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	990 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	991
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	992
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	993 enum
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	994 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	995 I_BRK = 0x00,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	996 I_RTS = 0x60,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	997 I_LDA_IMD = 0xa9,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	998 I_STA_ABS = 0x8d,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	999 };
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1000
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1001
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1002 static int fmtDecode6502SpeedCode(const DMGrowBuf buf, DMC64Image img, const int cbank)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1003 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1004 size_t reg_pc = 0;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1005 Uint8 reg_accu = 0;//, reg_x = 0, reg_y = 0;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1006 Uint16 reg_ptr;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1007
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1008 while (reg_pc < buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1009 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1010 Uint8 instr = buf->data[reg_pc++];
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1011
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1012 switch (instr)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1013 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1014 case I_LDA_IMD:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1015 if (reg_pc >= buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1016 goto out;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1017
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1018 reg_accu = buf->data[reg_pc++];
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1019 break;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1020
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1021 case I_STA_ABS:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1022 if (reg_pc >= buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1023 goto out;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1024 reg_ptr = buf->data[reg_pc++];
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1025
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1026 if (reg_pc >= buf->size)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1027 goto out;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1028 reg_ptr \|= buf->data[reg_pc++] << 8;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1029
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1030 if (reg_ptr >= 0xd800 && reg_ptr <= 0xdbff)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1031 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1032 img->color[cbank].data[reg_ptr - 0xd800] = reg_accu;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1033 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1034 break;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1035
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1036 case I_RTS:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1037 return DMERR_OK;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1038
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1039 default:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1040 return DMERR_INVALID_DATA;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1041 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1042 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1043
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1044 out:
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1045 return DMERR_INVALID_DATA;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1046 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1047
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1048
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1049 static int fmtDecodeFlinterlazer(const DMC64EncDecOp op, DMC64Image img,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1050 const DMGrowBuf buf, const DMC64ImageCommonFormat fmt)
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1051 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1052 DMGrowBuf tmp;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1053 (void) op;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1054 (void) fmt;
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1055
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1056 // Flinterlazer stores color RAMs as speedcode, so we need to
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1057 // decode some 6510 instructions to get the data.
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1058 return fmtDecode6502SpeedCode(
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1059 dmGrowBufConstCopyOffsSize(&tmp, buf, 0, 0x17b2), img, 0);
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1060 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1061
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	1062
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1665 diff changeset	1063 #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	1064 #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	1065 #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	1066 #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	1067 #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	1068
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1069
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1070 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	1071 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1072 if (buf->len >= XX2_MIN_SIZE &&
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1073 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	1074 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	1075 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	1076
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1077 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	1078 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1079
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1080
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1081 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	1082 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1083 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1084 DMGrowBuf tmp;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1085
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1086 // 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	1087 // 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	1088 // 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	1089 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	1090 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091
1748 9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	1092 tmp.len = tmp.size;
9c4b3fecc510 Use the new DMGrowBuf functions in XX2 format buffer enlarging. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	1093 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	1094 dmGrowBufFree(&tmp);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1095 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1096 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1097
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1098
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1099 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	1100 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1101 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	1102 {
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1103 // Packed variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1104 if (fmt->size == 0 &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1105 dmCompareAddr16(buf, 2, fmt->addr + buf->len - 3) &&
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1106 dmCompareAddr16(buf, 4, 0x7ff2))
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1107 return DM_PROBE_SCORE_MAX;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1108
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1109 // Unpacked variant
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1110 if (fmt->size != 0 && fmt->size == buf->len)
2168 b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1111 {
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1112 // In the unpacked format the first 0x40 bytes should be 0xff
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1113 for (size_t offs = 2; offs < 0x42; offs++)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1114 if (buf->data[offs] != 0xff)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1115 return DM_PROBE_SCORE_GOOD;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1116
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1117 return DM_PROBE_SCORE_MAX;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1118 }
1812 7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1119 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1120
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1121 return DM_PROBE_SCORE_FALSE;
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1122 }
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1123
7460a9b804e9 Oops. Add missing fmtProbeCosmosDesignsHiresManager() function. :S Matti Hamalainen <ccr@tnsp.org> parents: 1806 diff changeset	1124
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1125 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	1126 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1127 int res;
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1128 DMGrowBuf tmp;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1129 Uint8 data, *dstBuf;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1130 const size_t baseAddr = 0x4000;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1131 const size_t dstSize = 0x8000 - baseAddr;
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1132 size_t dstOffs, srcOffs, ncount;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1133
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1134 // Allocate output buffer
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1135 if ((dstBuf = dmMalloc0(dstSize)) == NULL)
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1136 {
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1137 return dmError(DMERR_MALLOC,
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1138 "Could not allocate memory for RLE decoding buffer.\n");
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1139 }
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1140
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1141 // Setup input and output offsets
0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1142 srcOffs = psrc->len - 1;
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1143 dstOffs = 0x7ff2 - baseAddr - 1;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1144
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1145 while (dstOffs > 0 && srcOffs > 0)
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1146 {
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1147 // Get one byte of data
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1148 data = psrc->data[srcOffs];
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1149
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1150 // Current data byte tells us the mode
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1151 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	1152 {
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1153 // RLE run
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1154 if (srcOffs < 3)
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1155 {
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1156 res = dmError(DMERR_INVALID_DATA,
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1157 "RLE: Invalid data/out of data for run sequence.\n");
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1158 goto out;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1159 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1160
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1161 ncount = psrc->data[--srcOffs];
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1162 data = psrc->data[--srcOffs];
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1163
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1164 if (dstOffs < ncount)
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1165 goto finish;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1166
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1167 dstOffs -= ncount;
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1168
0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1169 for (size_t n = 0; n < ncount + 1; n++)
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1170 dstBuf[dstOffs + n] = data;
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1171
0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1172 srcOffs--;
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1173 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1174 else
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1175 {
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1176 // Literal run of data bytes
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1177 ncount = data;
2150 b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1178 if (srcOffs < ncount)
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1179 ncount = srcOffs;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1180
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1181 if (dstOffs < ncount)
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1182 ncount = dstOffs;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1183
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1184 srcOffs -= ncount;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1185 dstOffs -= ncount - 1;
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1186
b4fbb90937f7 Fix Cosmos Designs Hires Manager unpacker. What a mess. Ugh. Matti Hamalainen <ccr@tnsp.org> parents: 2149 diff changeset	1187 for (size_t n = 0; n < ncount; n++)
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	1188 dstBuf[dstOffs + n] = psrc->data[srcOffs + n];
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1189 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1190 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1191
2149 810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1192 finish:
810fc98d9003 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2141 diff changeset	1193
2152 44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1194 // Fixups that the original decoder does, not necessary really
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1195 dstBuf[0x7ff0 - baseAddr] = 0x03;
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1196 dstBuf[0x7ffe - baseAddr] = dstBuf[4];
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1197
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1198 for (size_t n = 0; n < 0x40; n++)
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1199 dstBuf[n] = 0xff;
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1200
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1201 for (size_t n = 0; n < 0x100; n++)
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1202 dstBuf[0x40 + n] = 0x00;
44d7e8e2483c Add in some fixups that the original CDHM decoder does, although these seem to be unnecessary. Matti Hamalainen <ccr@tnsp.org> parents: 2151 diff changeset	1203
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1204 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCreateFrom(&tmp, dstBuf, dstSize), fmt);
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1205
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1206 out:
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1207 dmFree(dstBuf);
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1208 return res;
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1209 }
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1210
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	1211
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1212 static const char *fmtFunPaint2_MagicID = "FUNPAINT (MT) ";
9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1213 #define fmtFunPaint2_Header_Size (0x10)
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1214
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1215
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1216 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	1217 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1218 if (buf->len > 30 &&
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1219 DM_MEMCMP_LEN(buf->data + 2, fmtFunPaint2_MagicID) == 0)
1777 a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1220 {
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1221 // Unpacked variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1222 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	1223 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	1224
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1225 // Packed variant
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1226 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	1227 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	1228 }
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1229
a7f9e12bcd9b Improve probing of FunPaint 2 packed vs. unpacked format variants. Matti Hamalainen <ccr@tnsp.org> parents: 1776 diff changeset	1230 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	1231 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1232
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1233
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1234 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	1235 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1236 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1237 DMGrowBuf tmp;
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1238
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1239 // 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	1240 if (buf->data[14])
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1241 {
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1242 DMGrowBuf mem;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1243 DMCompParams cfg;
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1244
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	1245 cfg.func = fmt->name;
1712 1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1246 cfg.type = DM_COMP_RLE_MARKER;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1247 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1;
1f4ed247763d Indentation cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1711 diff changeset	1248 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	1249
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1250 dmGrowBufCopyOffs(&tmp, buf, fmtFunPaint2_Header_Size, 1);
1749 feaf5cf07603 Apparently Fun Paint 2 also saves one byte less than it should with the Matti Hamalainen <ccr@tnsp.org> parents: 1748 diff changeset	1251 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	1252
1598 b5e0f28f1842 Adjust Fun Paint 2 decoding now that the RLE decoding is fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1594 diff changeset	1253 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	1254 &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	1255 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	1256
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1257 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	1258 dmGrowBufFree(&tmp);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1259 }
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1260 else
4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1261 {
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1262 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCopyOffs(&tmp, buf, fmtFunPaint2_Header_Size), fmt);
1579 4288b21e97b9 Improve and simplify Fun Paint 2 format support. Matti Hamalainen <ccr@tnsp.org> parents: 1578 diff changeset	1263 }
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1264
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1265 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1266 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1267
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1268
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1269 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	1270 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1271 // Add the header bits
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1272 if (!dmGrowBufPut(buf, (Uint8 *) fmtFunPaint2_MagicID, strlen(fmtFunPaint2_MagicID)) \|\|
1838 d02514ceed91 Fix Fun Paint 2 packed variant writing, it was missing one byte (the "is packed" flag). Matti Hamalainen <ccr@tnsp.org> parents: 1834 diff changeset	1273 !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	1274 !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	1275 return DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1276
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1277 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	1278 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1279
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1280
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1281 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	1282 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1283 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1284 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	1285 DMCompParams cfg;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1286
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1287 // 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	1288 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	1289 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1290
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	1291 // 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	1292 cfg.func = fmt->name;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1293 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	1294 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	1295 cfg.rleMinCountB = 4;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1653 diff changeset	1296 cfg.rleMaxCountB = 255;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1297
2329 0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1298 if ((res = dmGenericRLEAnalyze(&mem, &cfg)) != DMERR_OK)
0085ce04788b Add return value (error code) to dmGenericRLEAnalyze() and pass it through where used. Matti Hamalainen <ccr@tnsp.org> parents: 2314 diff changeset	1299 goto out;
1661 dc3fbd130db7 RLE analyze was ran before setting up the compression config. Oops. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1300
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1301 // Add the header bits
2188 9b7d5e219d4b Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2187 diff changeset	1302 if (!dmGrowBufPut(buf, (Uint8 *) fmtFunPaint2_MagicID, strlen(fmtFunPaint2_MagicID)) \|\|
1838 d02514ceed91 Fix Fun Paint 2 packed variant writing, it was missing one byte (the "is packed" flag). Matti Hamalainen <ccr@tnsp.org> parents: 1834 diff changeset	1303 !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	1304 !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	1305 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1306 res = DMERR_MALLOC;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307 goto out;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1308 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1309
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1310 // 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	1311 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	1312
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1313 out:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1314 dmGrowBufFree(&mem);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1315 return res;
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1316 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1317
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1318
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1319 static int fmtGetPixelFunPaint2(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1320 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	1321 {
2306 e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1322 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1323 const int bitmap = rasterX & 1;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1324 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	1325 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	1326
2306 e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1327 (void) vshift;
e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1328
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1329 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1330 bmoffs, scroffs,
2306 e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1331 6 - (rasterX & 6),
e798a41f27a5 Clean up some code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 2302 diff changeset	1332 yb + (bitmap * 8),
2222 75b5bb490f38 Add & 15 to deeper helper functions and remove it from unnecessary places. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	1333 bitmap, 0, bgcol);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1334 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1335
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1336
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1337 static int fmtGetPixelBFLI(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1338 const DMC64Image *img, const int rasterX, const int rasterY)
1582 1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1339 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1340 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	1341 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	1342 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	1343
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1344 return dmC64GetGenericMCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1345 bmoffs & 0x1fff, scroffs & 0x3ff,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1346 vshift, vbank,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1347 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	1348 }
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1349
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	1350
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1351 static int fmtGetPixelPentelPaint(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1352 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	1353 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1354 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2163 1e7d80bfc8f1 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2161 diff changeset	1355 const int spr_y = rasterY / D64_SPR_HEIGHT_PX;
1e7d80bfc8f1 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2161 diff changeset	1356 const int spr_yd = rasterY % D64_SPR_HEIGHT_PX;
1e7d80bfc8f1 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2161 diff changeset	1357 const int spr_x = rasterX / D64_SPR_WIDTH_PX;
2166 4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1358 const int spr_xd = (rasterX % D64_SPR_WIDTH_PX) / 8;
4c3fdc9c0056 Clean up some variable and constant names. Matti Hamalainen <ccr@tnsp.org> parents: 2165 diff changeset	1359 const int offs = (spr_y * 8 + spr_x) * D64_SPR_SIZE + (spr_yd * D64_SPR_WIDTH_UT) + spr_xd;
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	1360 const int mask = 1 << (7 - (rasterX & 7));
2163 1e7d80bfc8f1 Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 2161 diff changeset	1361 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	1362
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1363 Uint8 color1,
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1364 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	1365 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	1366
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1367 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	1368 return res;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1369
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1370 *(scan->col) = color3 ? color3 : ( color2 ? color2 : color1 );
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1371 return DMERR_OK;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1372 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1373
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1374
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1375 // Horizontal character X-offset and scanline Y-offset
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1376 #define DM_CREST_SHFLI_IMG_XOFFS 14
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1377 #define DM_CREST_SHFLI_IMG_YOFFS 1
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1378
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1379 // True image width and height in character blocks
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1380 #define DM_CREST_SHFLI_IMG_WIDTH (4 * D64_SPR_WIDTH_UT)
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1381 #define DM_CREST_SHFLI_IMG_HEIGHT 21
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1382
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1383 #define DM_CREST_SHFLI_BANKS 8
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1384 #define DM_CREST_SHFLI_PTRS 8
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1385
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1386 static const Uint8 fmtCrestSHFLI_Sprite_pointers[DM_CREST_SHFLI_BANKS][DM_CREST_SHFLI_PTRS] =
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1387 {
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1388 { 0x80, 0x84, 0x85, 0x89, 0x8A, 0x8E, 0x8F, 0x93 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1389 { 0x94, 0x98, 0x99, 0x9D, 0x9E, 0xA2, 0xA3, 0xA7 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1390 { 0xA8, 0xAC, 0xAD, 0xB1, 0xB2, 0xB6, 0xB7, 0xBB },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1391 { 0xBC, 0xC0, 0xC1, 0xC5, 0xC6, 0xCA, 0xCB, 0xCF },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1392 { 0xD0, 0xD4, 0xD5, 0xD9, 0xDA, 0xDE, 0xDF, 0xE3 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1393 { 0xE4, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1394 { 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6 },
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1395 { 0xF7, 0x1E, 0x2E, 0x3E, 0x4E, 0x5E, 0x6E, 0x7E },
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1396 };
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1397
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1398
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1399 static const Uint8 fmtCrestSHFLI_MagicID_Packed[] =
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1400 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1401 0x83, 0x92, 0x85, 0x93, 0x94,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1402 };
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1403
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1404
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1405 static int fmtProbeCrestSHFLI(const DMGrowBuf buf, const DMC64ImageFormat fmt)
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1406 {
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1407 // Unpacked variant
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1408 if (buf->len == fmt->size &&
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1409 dmCompareAddr16(buf, 0, fmt->addr))
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1410 {
2187 ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1411 int score = DM_PROBE_SCORE_MAYBE;
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1412 for (int nbank = 0; nbank < DM_CREST_SHFLI_BANKS; nbank++)
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1413 {
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1414 if (memcmp(buf->data + 2 + (nbank * 0x0400) + 0x03f8,
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1415 fmtCrestSHFLI_Sprite_pointers[nbank], DM_CREST_SHFLI_PTRS) == 0)
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1416 score += DM_PROBE_SCORE_GOOD;
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1417 }
ec47c60d26e2 Improve Crest Super Hires FLI probing. Matti Hamalainen <ccr@tnsp.org> parents: 2186 diff changeset	1418 return score;
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1419 }
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1420
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1421 // Packed variant
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1422 if (dmCompareAddr16(buf, 0, fmt->addr) &&
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1423 buf->len > sizeof(fmtCrestSHFLI_MagicID_Packed) &&
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1424 DM_MEMCMP_SIZE(buf->data + buf->len - sizeof(fmtCrestSHFLI_MagicID_Packed), fmtCrestSHFLI_MagicID_Packed) == 0)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1425 return DM_PROBE_SCORE_MAX;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1426
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1427 return DM_PROBE_SCORE_FALSE;
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1428 }
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1429
9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	1430
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1431 static int fmtDecodeCrestSHFLIPacked(DMC64Image img, const DMGrowBuf buf, const DMC64ImageFormat *fmt)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1432 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1433 int res;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1434 DMGrowBuf tmp, mem;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1435 DMCompParams cfg;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1436
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1437 // Compression is typical RLE, with first byte being the RLE marker byte etc.
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1438 // However, as a difference to the uncompressed files, only the data of the
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1439 // 96 pixels wide area (4 sprite widths) x 168 tall is saved.
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1440 cfg.func = fmt->name;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1441 cfg.type = DM_COMP_RLE_MARKER;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1442 cfg.flags = DM_RLE_BYTE_RUNS \| DM_RLE_ORDER_1 \| DM_RLE_ZERO_COUNT_MAX;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1443 cfg.rleMarkerB = buf->data[0];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1444
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1445 if ((res = dmDecodeGenericRLEAlloc(
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1446 &mem, dmGrowBufConstCopyOffs(&tmp, buf, 1), &cfg)) == DMERR_OK)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1447 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1448 const size_t fmtUncompSize = 0x1ff0;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1449 const size_t dstSize = 16 * 1024;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1450 Uint8 dstBuf, sptr, *dptr;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1451
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1452 // Check uncompressed size?
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1453 if (mem.len != fmtUncompSize)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1454 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1455 res = dmError(DMERR_INVALID_DATA,
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2378 diff changeset	1456 "%s: Unexpected uncompressed data size %" DM_PRIu_SIZE_T
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2378 diff changeset	1457 " bytes (should be %" DM_PRIu_SIZE_T ").\n",
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1458 cfg.func, mem.len, fmtUncompSize);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1459 goto out;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1460 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1461
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1462 // Allocate output buffer
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1463 if ((dstBuf = dmMalloc0(dstSize)) == NULL)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1464 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1465 res = dmError(DMERR_MALLOC,
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2378 diff changeset	1466 "%s: Could not allocate temporary memory buffer of %" DM_PRIu_SIZE_T " bytes.\n",
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1467 cfg.func, dstSize);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1468 goto out;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1469 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1470
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1471 // Now that we have the uncompressed data (0x1ff0 bytes), we need to
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1472 // re-arrange it. The data is as follows ..
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1473 //
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1474 // 0x0000 - sprite data for 64 sprites
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1475 // 0x1000 - bitmap (12 * 21 bytes)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1476 // 0x1800 - screen RAMs (12 * 21 bytes) x 8 banks
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1477 // 0x1fe8 - sprite color #1
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1478 // 0x1fe9 - sprite color #2
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1479 //
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1480
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1481 // Copy sprite colors
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1482 sptr = mem.data + 0x1fe8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1483 dptr = dstBuf + 0x03e8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1484 dptr[0] = sptr[0];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1485 dptr[1] = sptr[1];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1486
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1487 // First, clear and set some defaults that are not saved in the file
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1488 for (int nbank = 0; nbank < DM_CREST_SHFLI_BANKS; nbank++)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1489 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1490 dptr = dstBuf + nbank * 0x0400;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1491
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1492 // Set preset screen RAM for other area
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1493 memset(dptr, 0xff, fmt->format->chWidth * fmt->format->chHeight);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1494
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1495 // Copy sprite data points
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1496 memcpy(dptr + 0x03f8, &fmtCrestSHFLI_Sprite_pointers[nbank], DM_CREST_SHFLI_PTRS);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1497 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1498
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1499 // Now we copy and transform the bitmap and screen RAM data.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1500 for (int yc = 0; yc < DM_CREST_SHFLI_IMG_HEIGHT * 8; yc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1501 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1502 const int syy = yc / 8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1503 const int syd = yc & 7;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1504
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1505 // In the image the first visible scanline is unused, but in
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1506 // the compressed version data starts right away, so we offset
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1507 // the destination Y coordinate by one.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1508 const int dyc = yc + DM_CREST_SHFLI_IMG_YOFFS;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1509 const int dyy = dyc / 8;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1510 const int dyd = dyc & 7;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1511
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1512 // Format of the bitmap data is one horizontal pixel row (12 bytes)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1513 // times 21*8 rows, e.g. the data is "linear" rows of bytes and not
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1514 // arranged in usual c64 bitmap "char" order. Thus we reorder it.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1515 sptr = mem.data + 0x1000 + DM_CREST_SHFLI_IMG_WIDTH * (syd + 8 * syy);
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1516 dptr = dstBuf + 0x2000 + DM_CREST_SHFLI_IMG_XOFFS * 8 + (fmt->format->chWidth * dyy * 8) + dyd;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1517
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1518 for (int xc = 0; xc < DM_CREST_SHFLI_IMG_WIDTH; xc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1519 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1520 dptr[xc * 8] = sptr[xc];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1521 sptr[xc] = 0xaa;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1522 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1523
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1524 // A bit similar arrangement is used for the screen RAM data.
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1525 // Each row of 12 bytes of data is for a bank. Next row is for
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1526 // next bank, etc.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1527 sptr = mem.data + 0x1800 + DM_CREST_SHFLI_IMG_WIDTH * syd + DM_CREST_SHFLI_IMG_WIDTH * 8 * syy;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1528 dptr = dstBuf + DM_CREST_SHFLI_IMG_XOFFS + 0x0400 * dyd + fmt->format->chWidth * dyy;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1529
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1530 for (int xc = 0; xc < DM_CREST_SHFLI_IMG_WIDTH; xc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1531 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1532 dptr[xc] = sptr[xc];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1533 sptr[xc] = 0xaa;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1534 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1535 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1536
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1537 // The sprite data is also transformed similarly, data is
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1538 // in same scanline format as the bitmap. Thus we need to
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1539 // place it where it belongs based on the sprite pointers.
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1540 for (int yc = 0; yc < DM_CREST_SHFLI_IMG_HEIGHT * 8; yc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1541 {
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1542 const int yd = yc % D64_SPR_HEIGHT_PX;
2190 0447f4c6c32b Fix a const discard issue. Matti Hamalainen <ccr@tnsp.org> parents: 2189 diff changeset	1543 const Uint8 *sprPtrs = fmtCrestSHFLI_Sprite_pointers[yc % 8];
0447f4c6c32b Fix a const discard issue. Matti Hamalainen <ccr@tnsp.org> parents: 2189 diff changeset	1544 Uint8 sp1, sp2, *dp;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1545
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1546 dptr = dstBuf + D64_SPR_WIDTH_UT * yd;
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1547 sp1 = mem.data + DM_CREST_SHFLI_IMG_WIDTH * yc;
2191 488130151097 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2190 diff changeset	1548 sp2 = sp1 + 0x0800;
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1549
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1550 for (int xc = 0; xc < DM_CREST_SHFLI_IMG_WIDTH / D64_SPR_WIDTH_UT; xc++)
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1551 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1552 dp = dptr + D64_SPR_SIZE * sprPtrs[xc];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1553 for (int xd = 0; xd < D64_SPR_WIDTH_UT; xd++)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1554 dp[xd] = *sp1++;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1555
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1556 dp = dptr + D64_SPR_SIZE * sprPtrs[xc + 4];
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1557 for (int xd = 0; xd < D64_SPR_WIDTH_UT; xd++)
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1558 dp[xd] = *sp2++;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1559 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1560 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1561
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1562 res = dmC64DecodeGenericBMP(img, dmGrowBufConstCreateFrom(&tmp, dstBuf, dstSize), fmt);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1563 dmFree(dstBuf);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1564 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1565
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1566 out:
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1567 dmGrowBufFree(&mem);
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1568
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1569 return res;
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1570 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1571
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1572
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1573 static int fmtGetSpritePixelCrestSHFLI(DMC64ScanLine *scan,
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1574 const DMC64Image *img, const int sindex, const int cindex,
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1575 const int spr_xd, const int spr_yd, const int mask)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1576 {
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1577 const size_t offs = sindex * D64_SPR_SIZE + (D64_SPR_WIDTH_UT * spr_yd) + spr_xd;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1578
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1579 if (offs >= img->extraData[14].size)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1580 return DMERR_BOUNDS;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1581
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1582 if (img->extraData[14].data[offs] & mask)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1583 {
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1584 *(scan->col) = img->extraData[15].data[cindex];
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1585 return DMERR_OK;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1586 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1587
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1588 return -1;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1589 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1590
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1591
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1592 static int fmtGetPixelCrestSHFLI(DMC64ScanLine *scan,
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1593 const DMC64Image *img, const int rasterX, const int rasterY)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1594 {
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1595 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1596 const int sprOffsetX = DM_CREST_SHFLI_IMG_XOFFS * 8,
868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1597 sprOffsetY = DM_CREST_SHFLI_IMG_YOFFS;
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1598 const int nbank = rasterY & 7;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1599 int res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1600
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1601 if (rasterY / 8 >= DM_CREST_SHFLI_IMG_HEIGHT)
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1602 {
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1603 *(scan->col) = 0x0f;
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1604 return DMERR_OK;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1605 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1606
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1607 if (rasterY >= sprOffsetY &&
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1608 rasterX >= sprOffsetX &&
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1609 rasterX < sprOffsetX + 4 * D64_SPR_WIDTH_PX)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1610 {
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1611 const int localX = rasterX - sprOffsetX,
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1612 localY = rasterY - sprOffsetY;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1613 const int sbank = localY & 7;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1614 const int spr_yd = localY % D64_SPR_HEIGHT_PX;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1615 const int spr_x = localX / D64_SPR_WIDTH_PX;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1616 const int spr_xd = (localX % D64_SPR_WIDTH_PX) / 8;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1617 const int mask = 1 << (7 - (localX & 7));
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1618
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1619 const int spr_offs = spr_x & 3;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1620 const int spr_index1 = img->extraData[sbank].data[spr_offs];
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1621 const int spr_index2 = img->extraData[sbank].data[spr_offs + 4];
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1622
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1623 if ((res = fmtGetSpritePixelCrestSHFLI(scan, img, spr_index1, 0, spr_xd, spr_yd, mask)) == DMERR_OK \|\|
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1624 res != -1)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1625 return res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1626
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1627 if ((res = fmtGetSpritePixelCrestSHFLI(scan, img, spr_index2, 1, spr_xd, spr_yd, mask)) == DMERR_OK \|\|
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1628 res != -1)
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1629 return res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1630 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1631
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1632 if ((res = dmC64GetGenericSCPixel(scan->col, img, bmoffs, scroffs, vshift, nbank, 0)) != DMERR_OK)
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1633 return res;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1634
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1635 return DMERR_OK;
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1636 }
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1637
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	1638
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1639 static int fmtGetPixelHCB(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1640 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	1641 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1642 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	1643 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	1644 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	1645
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1646 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	1647 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	1648
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1649 return dmC64GetGenericMCPixel(scan->col, img,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1650 bmoffs, scroffs,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1651 vshift, vbank,
2222 75b5bb490f38 Add & 15 to deeper helper functions and remove it from unnecessary places. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	1652 0, vbank, bgcol);
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1653 }
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1654
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	1655
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1656 static int fmtGetPixelCrestHIFLIorCDHM(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1657 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	1658 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1659 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1660
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1661 return dmC64GetGenericSCPixel(scan->col, img,
2133 898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1662 bmoffs, scroffs,
898c1edadbc6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2130 diff changeset	1663 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	1664 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1665
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1666
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1667 static int fmtGetPixelECI(DMC64ScanLine *scan,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1668 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	1669 {
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1670 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	1671 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	1672 Uint8 color1, color2;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1673 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	1674
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1675 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	1676 (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	1677 return res;
2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1678
2343 94a653883a32 Change Uint8 pointer in getPixel functions to DMC64ScanLine pointer in Matti Hamalainen <ccr@tnsp.org> parents: 2331 diff changeset	1679 (scan->col) = (color1 D64_NCOLORS) + color2;
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1680 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	1681 }
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1682
183d503b17a7 Implement support for hires FLI interlaced "ECI Graphic Editor 1.0 (unpacked)" format. Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	1683
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1779 diff changeset	1684 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	1685 {
2168 b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1686 int score = DM_PROBE_SCORE_FALSE;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1687
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1688 if (buf->len > 128 &&
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1689 dmCompareAddr16(buf, 0, fmt->addr))
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1690 {
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1691 size_t i, n;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1692
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1693 // Count statistics about used byte values and compare to
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1694 // value in buf[2] which is the RLE marker
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1695 for (n = 0, i = 3; i < buf->len; i++)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1696 if (buf->data[i] == buf->data[2]) n++;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1697
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1698 if (n > 50)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1699 score = DM_PROBE_SCORE_GOOD;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1700 else
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1701 if (n > 25)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1702 score = DM_PROBE_SCORE_AVG;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1703 else
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1704 if (n > 10)
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1705 score = DM_PROBE_SCORE_MAYBE;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1706 }
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1707
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1708 if (// Try to avoid misprobe of Crest Hires FLI Designer and Cosmos Design format
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1709 buf->len == 16386 \|\|
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	1710 // Face Painter
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	1711 buf->len == 10004)
2168 b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1712 score /= 3;
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1713
b4f4251eaaae Improve probing resiliency of Cosmos Designs and ECI formats, and try to Matti Hamalainen <ccr@tnsp.org> parents: 2167 diff changeset	1714 return score;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1715 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1716
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1717
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1718 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	1719 {
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1720 int res;
2170 7c4c9013e412 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2169 diff changeset	1721 DMGrowBuf mem, tmp;
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1722 DMCompParams cfg;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1723
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1724 cfg.func = fmt->name;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1725 cfg.type = DM_COMP_RLE_MARKER;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1726 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	1727 cfg.rleMarkerB = buf->data[0];
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1728
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1729 if ((res = dmDecodeGenericRLEAlloc(
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1746 diff changeset	1730 &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	1731 res = dmC64DecodeGenericBMP(img, &mem, fmt);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1732
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1733 dmGrowBufFree(&mem);
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1734 return res;
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1735 }
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1736
83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1737
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1738 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	1739 {
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1740 int res;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1741 DMGrowBuf tmp;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1742 DMCompParams cfg;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1743
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1744 // 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	1745 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	1746 goto out;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1747
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1748 // 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	1749 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	1750 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	1751 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	1752 cfg.rleMinCountB = 4;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1753 cfg.rleMaxCountB = 255;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1754
2331 6dc64deb6718 Missed on dmGenericRLEAnalyze() call from a previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 2329 diff changeset	1755 if ((res = dmGenericRLEAnalyze(&tmp, &cfg)) != DMERR_OK)
6dc64deb6718 Missed on dmGenericRLEAnalyze() call from a previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 2329 diff changeset	1756 goto out;
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1757
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1758 // 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	1759 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	1760 {
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1761 res = DMERR_MALLOC;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1762 goto out;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1763 }
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1764
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1765 // 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	1766 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	1767
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1768 out:
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1769 dmGrowBufFree(&tmp);
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1770 return res;
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1771 }
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1772
8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	1773
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1774 //
1795 c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	1775 // Helper macros for defining screen memory layouts
c8d690e8f9e9 Fix some typos in comments. Matti Hamalainen <ccr@tnsp.org> parents: 1792 diff changeset	1776 // 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	1777 //
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1778 #define DEF_REPEAT_BLOCK(dtype, start, oindex, bindex, osize, bsize, oflags) \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1779 { DO_COPY, (dtype), (start) + ((osize) * (oindex)), (bindex), (bsize), 0, NULL, NULL, (oflags) }
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1780
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1781 #define DEF_REPEAT_BLOCK_8(dtype, start, sindex, osize, bsize, oflags) \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1782 DEF_REPEAT_BLOCK((dtype), (start), 0, ((sindex) + 0), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1783 DEF_REPEAT_BLOCK((dtype), (start), 1, ((sindex) + 1), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1784 DEF_REPEAT_BLOCK((dtype), (start), 2, ((sindex) + 2), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1785 DEF_REPEAT_BLOCK((dtype), (start), 3, ((sindex) + 3), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1786 DEF_REPEAT_BLOCK((dtype), (start), 4, ((sindex) + 4), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1787 DEF_REPEAT_BLOCK((dtype), (start), 5, ((sindex) + 5), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1788 DEF_REPEAT_BLOCK((dtype), (start), 6, ((sindex) + 6), (osize), (bsize), (oflags)), \
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1789 DEF_REPEAT_BLOCK((dtype), (start), 7, ((sindex) + 7), (osize), (bsize), (oflags))
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1790
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1791
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1792 //
1861 752893fa6412 Update a comment. Matti Hamalainen <ccr@tnsp.org> parents: 1860 diff changeset	1793 // 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	1794 // 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	1795 // 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	1796 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1797 DMC64ImageCommonFormat dmC64CommonFormats[] =
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1798 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	1799 { // #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	1800 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1801 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1802 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	1803 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	1804 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1805 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1806 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1807 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1808 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1809 { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1810 { DO_SET_MEM_LO , DS_BGCOL , 0x2710, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1811 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1812 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1813 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1814
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1815 { // #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	1816 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1817 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1818 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	1819 2, 1,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1820 NULL, NULL,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1821 fmtGetPixelBlackMailFLI,
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1822 {
2294 7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1823 { DO_COPY , DS_EXTRA_DATA , 0x0000, 0, 200 , 0, NULL, NULL, DF_NORMAL },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1824 { DO_COPY , DS_COLOR_RAM , 0x0100, 0, 0 , 0, NULL, NULL, DF_NORMAL },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1825 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x0500, 0, 0x400, 0, DF_NORMAL),
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1826 { DO_COPY , DS_BITMAP_RAM , 0x2500, 0, 0 , 0, NULL, NULL, DF_NORMAL },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1827
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1828 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0 , 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
7f6ba3b32f54 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2287 diff changeset	1829 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	1830 }
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1831 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1832
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1833 { // #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	1834 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1835 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1836 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	1837 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	1838 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1839 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1840 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1841 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1842 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1843 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1844 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1845 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1846
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1847 { // #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	1848 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	1849 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1850 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	1851 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	1852 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	1853 fmtGetPixelFunPaint2,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1854 {
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1855 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x0000, 0, 0x400, 0, DF_NORMAL),
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1856 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1857 { DO_COPY , DS_EXTRA_DATA , 0x3f48, 0, 100 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1858 { DO_COPY , DS_COLOR_RAM , 0x4000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1859 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x43e8, 8, 0x400, 0, DF_NORMAL),
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1860 { DO_COPY , DS_BITMAP_RAM , 0x63e8, 1, 0 , 0, NULL, NULL, DF_NORMAL },
a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1861 { DO_COPY , DS_EXTRA_DATA , 0x8328, 0, 100 , 100, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1862 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1863 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1864 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1865 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1866 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1867
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1868 { // #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	1869 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1870 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1871 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	1872 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	1873 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1874 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1875 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1876 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1877 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1878 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1879 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1880 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1881 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1882 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	1883
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1884 { // #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	1885 D64_FMT_MC \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1886 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1887 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	1888 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	1889 NULL, NULL,
2129 2129d4ac6f45 Refactor c64 image rendering completely to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 2127 diff changeset	1890 fmtGetPixelDrazLace,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1891 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1892 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1893 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1894 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1895 { DO_SET_MEM_LO , DS_BGCOL , 0x2740, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1896 { DO_FUNC , 0 , 0x2742, 0, 1, 0, fmtDrazLaceGetLaceType, fmtDrazLaceSetLaceType, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1897 { DO_COPY , DS_BITMAP_RAM , 0x2800, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1898 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1899 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1900 },
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	1901
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1902 { // #6: TruePaint
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1903 D64_FMT_MC \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1904 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1905 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	1906 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	1907 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1908 fmtGetPixelTruePaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1909 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1910 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1911 { DO_SET_MEM_LO , DS_BGCOL , 0x03e8, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1912 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1913 { DO_COPY , DS_BITMAP_RAM , 0x2400, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1914 { DO_COPY , DS_SCREEN_RAM , 0x4400, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1915 { DO_COPY , DS_COLOR_RAM , 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1916 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1917 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1918 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1919 },
1739 83f50e431206 Implement support for ECI packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1734 diff changeset	1920
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1921 { // #7: ECI Graphic Editor Hires FLI
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1922 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_ILACE,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1923 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1924 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	1925 1, 1,
2224 a36c81c3df85 Make color interlace type generate a mixed palette instead of using special Matti Hamalainen <ccr@tnsp.org> parents: 2222 diff changeset	1926 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	1927 fmtGetPixelECI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1928 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1929 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1930 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x2000, 0, 0x400, 0, DF_NORMAL),
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1931 { DO_COPY , DS_BITMAP_RAM , 0x4000, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1932 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x6000, 8, 0x400, 0, DF_NORMAL),
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1933 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_COLOR, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1934 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1935 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1936 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1937 },
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 { // #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	1940 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1941 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	1942 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	1943 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	1944 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1945 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1946 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1947 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1948 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x2000, 0, 0x400, 0, DF_NORMAL),
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1949 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1950 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1951 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	1952 },
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	1953
2018 1c45b2fb471d Adjust a comment. Matti Hamalainen <ccr@tnsp.org> parents: 2015 diff changeset	1954 { // #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	1955 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1956 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1957 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	1958 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	1959 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	1960 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	1961 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1962 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1963 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM, 0x0400, 0, 0x400, 0, DF_NORMAL),
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1964 { DO_COPY , DS_BITMAP_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1965 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1966 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1834 69871828838c Separate the format entries for "FBI Crew FLI Designer 1.1" and "FLI Designer 2" Matti Hamalainen <ccr@tnsp.org> parents: 1832 diff changeset	1967 }
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	1968 },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1969
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1970 { // #10: Doodle
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1971 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1972 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	1973 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	1974 1, 1,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1975 NULL, NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1976 NULL,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1977 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1978 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1979 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1980 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1981 }
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	1982 },
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1983
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1984 { // #11: Crest Super Hires FLI Editor 1.0 (SHF)
2314 87533af8db64 Add format flag for formats that use sprite layer. Matti Hamalainen <ccr@tnsp.org> parents: 2313 diff changeset	1985 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_SPRITES,
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1986 D64_SCR_WIDTH, D64_SCR_HEIGHT,
2195 868b68c188e5 Cleanup Crest SHFLI decoding and use specific constants better. Matti Hamalainen <ccr@tnsp.org> parents: 2193 diff changeset	1987 D64_SCR_CH_WIDTH, 24,
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1988 1, 1,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1989 NULL, NULL,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1990 fmtGetPixelCrestSHFLI,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1991 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1992 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM, 0x0000, 0 , 0x0400, 0x0400, DF_NORMAL),
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1993 DEF_REPEAT_BLOCK_8(DS_EXTRA_DATA, 0x03f8, 0 , 0x0400, 8, DF_DECODE), // Sprite pointers for each bank
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1994 { DO_COPY , DS_EXTRA_DATA , 0x03e8, 15 , 2 , 0, NULL, NULL, DF_DECODE }, // 2 sprite colors
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1995 { DO_COPY , DS_EXTRA_DATA , 0x0000, 14 , 0x3e00, 0, NULL, NULL, DF_DECODE }, // Lazily copy whole data for sprite data
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1996 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0 , 0 , 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	1997 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	1998 { DO_LAST , 0 , 0 , 0 , 0 , 0, NULL, NULL, DF_NORMAL },
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	1999 }
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2000 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2001 };
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2002
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2003
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2004 //
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2005 // 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	2006 //
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2007 DMC64ImageFormat dmC64ImageFormats[] =
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2008 {
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2009 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2010 "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	2011 fmtProbeDrazPaint20Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2012 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	2013 { }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2014 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2015
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2016 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2017 "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	2018 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2019 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	2020 { }, &dmC64CommonFormats[4]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2021 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2022
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2023 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2024 "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	2025 fmtProbeDrazLace10Packed,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2026 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	2027 { }, &dmC64CommonFormats[5]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2028 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2029
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2030 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2031 "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	2032 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2033 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	2034 { }, &dmC64CommonFormats[5]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2035 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2036
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2037 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2038 "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	2039 fmtProbeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2040 fmtDecodeBDP5Packed, fmtEncodeBDP5Packed,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2041 { }, &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	2042 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2043
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2044 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2045 "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	2046 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2047 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2048 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2049 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2050 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2051 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	2052 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	2053 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2054 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2055 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2056 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2057 { DO_SET_MEM_LO , DS_BGCOL , 0x07e8, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2058 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2059 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2060 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2061 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2062 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2063 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2064 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2065
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2066 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2067 "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	2068 NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2069 NULL, NULL,
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2070 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2071 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2072 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2073 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	2074 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	2075 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2076 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2077 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2078 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2079 { DO_SET_MEM_LO , DS_BGCOL , 0x07fe, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2080 { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2081 { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2082 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2083 },
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2084 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2085 NULL
1574 0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2086 },
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2087
0b0870a216e9 Add support for "Picasso 64" and "Vidcom 64" multicolor formats. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	2088 {
1816 8d7b424197bc Allow writing of unpacked True Paint format. Matti Hamalainen <ccr@tnsp.org> parents: 1815 diff changeset	2089 "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	2090 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2091 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	2092 { }, &dmC64CommonFormats[6]
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2093 },
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2094
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2095 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2096 "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	2097 fmtProbeTruePaintPacked,
415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2098 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	2099 { }, &dmC64CommonFormats[6]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2100 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2101
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2102 {
1815 2b68b6955635 Rename "Koala Paint" to "Koala Painter". Matti Hamalainen <ccr@tnsp.org> parents: 1813 diff changeset	2103 "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	2104 fmtProbeKoalaPainter,
1646 415c732dc14c Implement support for packed TruePaint images. Matti Hamalainen <ccr@tnsp.org> parents: 1636 diff changeset	2105 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	2106 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2107 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2108
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2109 {
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	2110 "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	2111 fmtProbeKoalaPainterPacked,
1839 666b27999570 As the Koala Painter plain RLE compression (without headers and static Matti Hamalainen <ccr@tnsp.org> parents: 1838 diff changeset	2112 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	2113 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2114 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2115
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2116 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2117 "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	2118 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2119 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2120 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2121 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2122 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2123 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	2124 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	2125 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2126 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2127 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2128 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2129 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2130 { DO_SET_MEM_LO , DS_D020 , 0x2328, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2131 { DO_SET_MEM_LO , DS_BGCOL , 0x2329, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2132 { DO_COPY , DS_COLOR_RAM , 0x2338, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2133 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2134 },
1593 a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	2135 },
a77876a07425 Oops, missed this from the last commit. Matti Hamalainen <ccr@tnsp.org> parents: 1592 diff changeset	2136 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2137 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2138
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2139 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2140 "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	2141 NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2142 NULL, NULL,
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2143 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2144 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2145 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2146 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	2147 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	2148 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2149 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2150 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2151 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2152 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2153 { DO_SET_MEM_LO , DS_BGCOL , 0x23ff, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2154 { DO_COPY , DS_SCREEN_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2155 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2156 }
1755 841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2157 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2158 NULL
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2159 },
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2160
841ee79030fa Implement support for Image System unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1754 diff changeset	2161 {
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	2162 "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	2163 fmtProbeMicroIllustrator,
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2164 NULL, NULL,
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2165 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2166 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2167 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2168 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	2169 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	2170 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2171 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2172 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2173 { DO_COPY , DS_SCREEN_RAM , 20 + 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2174 { DO_COPY , DS_COLOR_RAM , 20 + 1000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2175 { DO_COPY , DS_BITMAP_RAM , 20 + 2000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1985 5817e3335f53 Allow saving of Micro Illustrator format, but mark it "broken" again due to Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	2176 // XXX TODO: Unknown where the background color is set, so default to 0x00
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2177 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2178 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3e8 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2179 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3e9 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2180 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3ea , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2181 { DO_SET_MEM_LO , DS_BGCOL , 20 + 0x3eb , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2182 { DO_FUNC , 0 , 0 , 0, 0, 0, NULL, fmtEncodeMicroIllustrator, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2183 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2184 }
1758 8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2185 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2186 NULL
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2187 },
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2188
8014e4cbebfe Add mostly working support for unknown unpacked multicolor format "MIL". Matti Hamalainen <ccr@tnsp.org> parents: 1757 diff changeset	2189 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2190 "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	2191 NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2192 NULL, NULL,
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2193 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2194 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2195 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2196 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	2197 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	2198 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2199 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2200 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2201 { DO_COPY , DS_BITMAP_RAM , 0x0000 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2202 { DO_COPY , DS_SCREEN_RAM , 0x1f40 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2203 { DO_COPY , DS_COLOR_RAM , 0x2328 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2204 { DO_SET_MEM_LO , DS_BGCOL , 0x2710 + 0x111, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2205 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2206 }
1754 aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2207 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2208 NULL
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2209 },
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2210
aa6a858db6bd Implement support for CPU-Paint unpacked format. Matti Hamalainen <ccr@tnsp.org> parents: 1753 diff changeset	2211 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2212 "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	2213 NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2214 NULL, NULL,
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2215 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2216 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2217 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2218 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	2219 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	2220 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2221 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2222 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2223 { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2224 { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2225 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2226 // XXX TODO: Not sure if the background color is hardcoded ..
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2227 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2228 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2229 }
1763 847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2230 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2231 NULL
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2232 },
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2233
847bd77a538d Implement Rainbow Painter format support. Matti Hamalainen <ccr@tnsp.org> parents: 1762 diff changeset	2234 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2235 "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	2236 fmtProbeSaracenPaint,
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2237 NULL, NULL,
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2238 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2239 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2240 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2241 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	2242 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	2243 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2244 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2245 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2246 { DO_COPY , DS_SCREEN_RAM , 0x7800 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2247 { DO_SET_MEM_LO , DS_BGCOL , 0x7bf0 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2248 { DO_COPY , DS_BITMAP_RAM , 0x7c00 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2249 { DO_COPY , DS_COLOR_RAM , 0x9c00 - 0x7800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2250 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2251 }
1769 bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2252 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2253 NULL
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2254 },
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2255
bf22cd877c13 Add support for Saracen Paint multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1768 diff changeset	2256 {
1980 2cf79254b8e4 Confirm the Blazing Paddles d020/bgcolor positions and remove the broken flag. Matti Hamalainen <ccr@tnsp.org> parents: 1979 diff changeset	2257 "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	2258 NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2259 NULL, NULL,
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2260 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2261 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2262 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2263 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	2264 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	2265 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2266 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2267 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2268 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
1980 2cf79254b8e4 Confirm the Blazing Paddles d020/bgcolor positions and remove the broken flag. Matti Hamalainen <ccr@tnsp.org> parents: 1979 diff changeset	2269 // Both d020 and bgcolor confirmed by tests
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2270 { DO_SET_MEM_LO , DS_D020 , 0x1f7f, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2271 { DO_SET_MEM_LO , DS_BGCOL , 0x1f80, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2272 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2273 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2274 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2275 }
1770 a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2276 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2277 NULL
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2278 },
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2279
a176dea422cb Add partially broken support for Blazing Paddles multicolor format. Matti Hamalainen <ccr@tnsp.org> parents: 1769 diff changeset	2280 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2281 "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	2282 NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2283 NULL, NULL,
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2284 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2285 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2286 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2287 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	2288 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	2289 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2290 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2291 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2292 { DO_COPY , DS_BITMAP_RAM , 0x4000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2293 { DO_COPY , DS_SCREEN_RAM , 0x6000 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2294 { DO_SET_MEM_LO , DS_D020 , 0x5f40 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2295 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x5f43 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2296 { DO_SET_MEM_LO , DS_BGCOL , 0x5f44 + 0x72 - 0x4000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2297 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2298 }
1762 b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2299 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2300 NULL
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2301 },
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2302
b69f3d97db9e Implement support for "PMG" format, a crippled variant of standard c64 Matti Hamalainen <ccr@tnsp.org> parents: 1760 diff changeset	2303 {
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2304 "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	2305 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2306 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2307 {
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2308 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2309 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2310 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	2311 2, 1,
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2312 NULL, NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2313 NULL,
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2314 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2315 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2316 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2317 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2318 { DO_SET_MEM_LO , DS_D020 , 0x27fe, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2319 { DO_SET_MEM_LO , DS_BGCOL , 0x27ff, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2320 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1779 20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2321 }
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2322 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2323 NULL
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2324 },
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2325
20bf4140eaa1 Add support for another plain multicolor variant, "Wigmore Artist 64". Matti Hamalainen <ccr@tnsp.org> parents: 1778 diff changeset	2326 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2327 "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	2328 fmtProbeAmicaPaintPacked,
1538 af729e29a6f6 Implement Amica Paint packed format encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1535 diff changeset	2329 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	2330 { }, &dmC64CommonFormats[0]
1503 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
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2333 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2334 "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	2335 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2336 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	2337 { }, &dmC64CommonFormats[0]
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2338 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2339
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2340 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2341 "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	2342 NULL,
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2343 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	2344 { }, &dmC64CommonFormats[0]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2345 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2346
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2347 {
1819 c12bd223000e Enable write support for some formats that should be workable. Matti Hamalainen <ccr@tnsp.org> parents: 1816 diff changeset	2348 "art", "Art Studio (unpacked)", 0x2000, 9009, DM_FMT_RDWR,
2161 6a6344f8f535 Add support for one more Art Studio hires variant. Matti Hamalainen <ccr@tnsp.org> parents: 2152 diff changeset	2349 fmtProbeArtStudio,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2350 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	2351 { }, &dmC64CommonFormats[2]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2352 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2353
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2354 {
1819 c12bd223000e Enable write support for some formats that should be workable. Matti Hamalainen <ccr@tnsp.org> parents: 1816 diff changeset	2355 "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	2356 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2357 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2358 { }, &dmC64CommonFormats[2]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2359 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2360
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2361 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2362 "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	2363 fmtProbeDoodle,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2364 NULL, NULL,
1840 8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2365 { }, &dmC64CommonFormats[10]
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2366 },
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2367
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2368 {
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2369 "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	2370 fmtProbeDoodle,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2371 fmtDecodeStaticRLEMarkerMode2, fmtEncodeStaticRLEMarkerMode2,
8d6bb48f2806 Implement support for packed variant of Doodle format. Matti Hamalainen <ccr@tnsp.org> parents: 1839 diff changeset	2372 { }, &dmC64CommonFormats[10]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2373 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2374
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2375 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2376 "mon", "Monomagic (unpacked)", 0x2000, 8194, DM_FMT_RDWR,
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2377 NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2378 NULL, NULL,
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2379 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2380 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2381 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2382 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	2383 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	2384 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2385 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2386 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2387 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2388 { DO_SET_OP , DS_SCREEN_RAM , 0xCF , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2389 // Default colors used by MM are --^^
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2390 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2391 }
1670 ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2392 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2393 NULL
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2394 },
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2395
ab4a38ba919f Implement hires Mono Magic support. Matti Hamalainen <ccr@tnsp.org> parents: 1669 diff changeset	2396 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2397 "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	2398 NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2399 NULL, NULL,
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2400 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2401 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2402 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2403 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	2404 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	2405 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2406 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2407 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2408 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2409 { DO_SET_OP , DS_SCREEN_RAM , 0xF0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2410 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2411 }
1671 dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2412 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2413 NULL
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2414 },
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2415
dd9528cdd14a Add support for a plain hires format at $2000. Matti Hamalainen <ccr@tnsp.org> parents: 1670 diff changeset	2416 {
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2417 "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	2418 fmtProbeGigapaintHires,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2419 NULL, NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2420 {
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2421 D64_FMT_HIRES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2422 D64_SCR_WIDTH , D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2423 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	2424 1, 1,
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2425 NULL, NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2426 NULL,
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2427 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2428 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2429 { DO_SET_OP , DS_SCREEN_RAM , 0x0F , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2430 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1915 788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2431 }
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2432 },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2433 NULL
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2434 },
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2435
788cfc7096f3 Add support for Gigapaint hires (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 1912 diff changeset	2436 {
1857 5d9dd663df8d Fix Pu-239 BFLI / BigFLI support. Matti Hamalainen <ccr@tnsp.org> parents: 1856 diff changeset	2437 "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	2438 NULL,
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	2439 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	2440 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2441 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2442 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT * 2,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2443 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	2444 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	2445 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2446 fmtGetPixelBFLI,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2447 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2448 { DO_COPY , DS_COLOR_RAM , 0x0001, 0, 0x400 , 0, NULL, NULL, DF_NORMAL },
2307 319fd953ba29 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2306 diff changeset	2449 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x0401, 0, 0x400 , 0, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2450 { DO_COPY , DS_BITMAP_RAM , 0x2401, 0, 0x2000, 0, NULL, NULL, DF_NORMAL },
2307 319fd953ba29 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2306 diff changeset	2451 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x4401, 8, 0x400 , 0x400, DF_NORMAL),
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2452 { DO_COPY , DS_BITMAP_RAM , 0x6401, 1, 0x2000, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2453 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8, 0, 0, D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2454 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2455 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2456 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2457 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	2458 },
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	2459
1f6aed186c4e Add somewhat broken support for "Big FLI" aka BFLI files. Needs more work. Matti Hamalainen <ccr@tnsp.org> parents: 1581 diff changeset	2460 {
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2461 "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	2462 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2463 NULL, NULL,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2464 { }, &dmC64CommonFormats[1]
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2465 },
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2466
04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2467 {
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	2468 "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	2469 fmtProbeBlackMailFLIPacked,
1832 843d3a593f05 Implement write support for Black Mail FLI Designer packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1819 diff changeset	2470 fmtDecodeBlackMailFLIPacked, fmtEncodeBlackMailFLIPacked,
1788 04e13949b314 Implement support for packed variant of Black Mail FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	2471 { }, &dmC64CommonFormats[1]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2472 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2473
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2474 {
2308 28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2475 "dfed", "Dolphins FLI Editor v3.2 (unpacked)", 0x3b00, 17665, DM_FMT_RDWR,
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2476 NULL,
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2477 NULL, NULL,
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2478 { }, &dmC64CommonFormats[1]
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2479 },
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2480
28701abacc31 Add support for Dolphins FLI Editor v3.2 (unpacked), which is exactly(?) Matti Hamalainen <ccr@tnsp.org> parents: 2307 diff changeset	2481 {
2014 a49f7e83edcb Fix FBI FLI Designer format names to match v1.x and v2. Matti Hamalainen <ccr@tnsp.org> parents: 1985 diff changeset	2482 "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	2483 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	2484 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	2485 { }, &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	2486 },
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	2487
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	2488 {
2014 a49f7e83edcb Fix FBI FLI Designer format names to match v1.x and v2. Matti Hamalainen <ccr@tnsp.org> parents: 1985 diff changeset	2489 "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	2490 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	2491 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	2492 { }, &dmC64CommonFormats[9]
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2493 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2494
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2495 {
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2496 "flnt", "Flinterlazer 1.0 (unpacked)", 0x284e, 38812, DM_FMT_RD \| DM_FMT_BROKEN,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2497 NULL,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2498 NULL, NULL,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2499 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2500 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2501 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2502 D64_SCR_CH_WIDTH , D64_SCR_CH_HEIGHT,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2503 2, 1,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2504 NULL, NULL,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2505 fmtGetPixelFlinterlazer,
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2506 {
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2507 { DO_COPY , DS_COLOR_RAM , 0x0000 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2508 { DO_COPY , DS_COLOR_RAM , 0x0000 , 1, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2509
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2510 { DO_COPY , DS_BITMAP_RAM , 0x4000 - 0x284e, 0, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2511 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x6000 - 0x284e, 0, 0x400, 0, DF_NORMAL),
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2512
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2513 { DO_COPY , DS_BITMAP_RAM , 0x8000 - 0x284e, 1, 0 , 0, NULL, NULL, DF_NORMAL },
2300 a494e4a4b6bc Minor improvements to Flinterlazer support. Matti Hamalainen <ccr@tnsp.org> parents: 2299 diff changeset	2514 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0xA000 - 0x284e, 8, 0x400, 0, DF_NORMAL),
2299 ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2515
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2516 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_COLOR, 0 , 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2517 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2518 { DO_FUNC , 0 , 0 , 0, 0, 0, fmtDecodeFlinterlazer, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2519 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2520 }
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2521 },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2522 NULL
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2523 },
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2524
ad019d930401 Add initial (broken) read support for Flinterlazer 1.0 images. Matti Hamalainen <ccr@tnsp.org> parents: 2294 diff changeset	2525 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2526 "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	2527 NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2528 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	2529 { }, &dmC64CommonFormats[7]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2530 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2531
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2532 {
2311 d0608fbd85bc Change ECI Graphic Editor 1.0 (packed) extension from "ecp" to "ecip". Matti Hamalainen <ccr@tnsp.org> parents: 2308 diff changeset	2533 "ecip", "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	2534 fmtProbeECIPacked,
1912 8d006508e6c1 Implement write support for ECI Graphic Editor 1.0 packed format. Matti Hamalainen <ccr@tnsp.org> parents: 1880 diff changeset	2535 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	2536 { }, &dmC64CommonFormats[7]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2537 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2538
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2539 {
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2540 "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	2541 NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2542 NULL, NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2543 { // 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	2544 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2545 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2546 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	2547 2, 1,
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2548 NULL, NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2549 NULL,
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2550 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2551 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2552 { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2553 { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2554 { DO_SET_MEM_LO , DS_BGCOL , 0x2710, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2555 { DO_SET_MEM_LO , DS_D020 , 0x2711, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2556 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1979 5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2557 }
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2558 },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2559 NULL
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2560 },
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2561
5fc3da6061be Add support for Face Painter format (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 1946 diff changeset	2562 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2563 "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	2564 NULL,
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2565 NULL, NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2566 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2567 D64_FMT_MC,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2568 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2569 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	2570 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	2571 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2572 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2573 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2574 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2575 { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2576 { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2577 { DO_SET_OP , DS_BGCOL , 0x00 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2578 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2579 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2580 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2581 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2582 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2583
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2584 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2585 "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	2586 fmtProbeFormatXX2,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2587 fmtDecodeFormatXX2, NULL,
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2588 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2589 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	2590 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	2591 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	2592 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	2593 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2594 NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2595 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2596 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, XX2_BSIZE, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2597 { DO_COPY , DS_SCREEN_RAM , XX2_BSIZE, 0, XX2_SIZE, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2598 { DO_COPY , DS_COLOR_RAM , XX2_BSIZE + XX2_SIZE, 0, XX2_SIZE, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2599 { DO_SET_OP , DS_BGCOL , 11 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2600 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2601 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2602 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2603 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2604 },
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2605
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2606 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2607 "fp2", "FunPaint II (unpacked)", 0x3ff0, 33694, DM_FMT_RDWR,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2608 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2609 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	2610 { }, &dmC64CommonFormats[3]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2611 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2612
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2613 {
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2614 "fp2p", "FunPaint II (packed)", 0x3ff0, 0, DM_FMT_RDWR,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2615 fmtProbeFunPaint2,
3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2616 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	2617 { }, &dmC64CommonFormats[3]
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2618 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2619
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2620 {
2191 488130151097 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2190 diff changeset	2621 "gun", "GunPaint 1.1 (unpacked)", 0x4000, 33603, 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	2622 fmtProbeGunPaint,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2623 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2624 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2625 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	2626 D64_SCR_WIDTH, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2627 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	2628 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	2629 NULL, NULL,
1850 3d6917948061 Backed out changeset 914dbb50139f Matti Hamalainen <ccr@tnsp.org> parents: 1849 diff changeset	2630 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	2631 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2632 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x0000, 0, 0x400, 0, DF_NORMAL),
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2633 { DO_COPY , DS_BITMAP_RAM , 0x2000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2634 { DO_COPY , DS_EXTRA_DATA , 0x3f4f, 0, 177, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2635 { DO_COPY , DS_COLOR_RAM , 0x4000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2636 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x4400, 8, 0x400, 0, DF_NORMAL),
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2637 { DO_COPY , DS_BITMAP_RAM , 0x6400, 1, 0 , 0, NULL, NULL, DF_NORMAL },
1847 e3d1f16be4ee Using the newly introduced data block offset feature, unify the handling of Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	2638 // 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	2639 // XXX TODO: According to some, the last 4 should be same ..
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2640 { DO_SET_MEM , DS_EXTRA_DATA , 0 , 0, 3 , 20+177, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2641 { DO_SET_OP , DS_EXTRA_INFO , D64_ILACE_RES , 0, 0 , D64_EI_ILACE_TYPE, NULL, NULL, DF_DECODE },
5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2642 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2643 { DO_FUNC , 0 , 0 , 0, 0 , 0, NULL, fmtEncodeGunPaint, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2644 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2645 }
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2646 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2647 NULL
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2648 },
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2649
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2650 {
1877 f8b7baf3ff89 Some fixes to HCB support, now the background colors are supported correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1876 diff changeset	2651 "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	2652 NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2653 NULL, NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2654 {
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2655 D64_FMT_MC \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2656 D64_SCR_WIDTH / 2, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2657 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	2658 2, 1,
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2659 NULL, NULL,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2660 fmtGetPixelHCB,
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2661 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2662 { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2663 { DO_COPY , DS_COLOR_RAM , 0x0400, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2664 { DO_COPY , DS_SCREEN_RAM , 0x0800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2665 { DO_COPY , DS_SCREEN_RAM , 0x0c00, 1, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2666 { DO_COPY , DS_BITMAP_RAM , 0x1000, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2667 { DO_COPY , DS_EXTRA_DATA , 0x2f40, 0, D64_SCR_HEIGHT / 4, 0, NULL, NULL, DF_NORMAL },
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2668 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2669 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1876 a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2670 }
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2671 },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2672 NULL
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2673 },
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2674
a35f6e19f57a Implement read-only support for HCB (Half Char Bitmap) format. Matti Hamalainen <ccr@tnsp.org> parents: 1861 diff changeset	2675 {
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	2676 "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	2677 NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2678 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2679 {
2314 87533af8db64 Add format flag for formats that use sprite layer. Matti Hamalainen <ccr@tnsp.org> parents: 2313 diff changeset	2680 D64_FMT_HIRES \| D64_FMT_FLI \| D64_FMT_SPRITES,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2681 192, D64_SCR_HEIGHT,
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2682 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	2683 2, 1,
1805 c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2684 NULL, NULL,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2685 fmtGetPixelPentelPaint,
c510bc979947 Reindent operator lists. Matti Hamalainen <ccr@tnsp.org> parents: 1804 diff changeset	2686 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2687 { DO_COPY , DS_BITMAP_RAM , 0x0000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2688 { DO_SET_OP , DS_SCREEN_RAM , 0x10 , 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2689 { DO_SET_MEM_LO , DS_BGCOL , 0x9580 - 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2690 { DO_SET_MEM_LO , DS_D022 , 0x9581 - 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL }, // Sprite color
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2691 { DO_SET_MEM_LO , DS_COLOR_RAM , 0x9582 - 0x4800, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2692 { DO_COPY , DS_EXTRA_DATA , 0x5ac0 - 0x4800, 0, D64_SPR_SIZE * 235, 0, NULL, NULL, DF_NORMAL }, // Sprite data
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2693 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2694 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2695 }
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2696 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2697 NULL
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2698 },
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2699
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2700 {
2169 271850d7dd9b Rename "Crest Hires FLI Designer (unpacked)" format short name to "chfd" from "chid". Matti Hamalainen <ccr@tnsp.org> parents: 2168 diff changeset	2701 "chfd", "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	2702 NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2703 NULL, NULL,
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2704 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2705 D64_FMT_HIRES \| D64_FMT_FLI,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2121 diff changeset	2706 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	2707 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	2708 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	2709 NULL, NULL,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2710 fmtGetPixelCrestHIFLIorCDHM,
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2711 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2712 { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0 , 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2713 DEF_REPEAT_BLOCK_8(DS_SCREEN_RAM , 0x2000, 0, 0x400, 0, DF_NORMAL),
2238 5db6e0b63b35 Change again how the interlace type information is stored. Now store it in Matti Hamalainen <ccr@tnsp.org> parents: 2224 diff changeset	2714 { DO_SET_OP , DS_EXTRA_INFO , D64_FLI_8 , 0, 0 , D64_EI_FLI_TYPE, NULL, NULL, DF_DECODE },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2715 { DO_LAST , 0 , 0 , 0, 0 , 0, NULL, NULL, DF_NORMAL },
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1773 diff changeset	2716 }
1592 91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2717 },
91d1bb571fca Implement common encdec ops lists for sharing oplists between formats that Matti Hamalainen <ccr@tnsp.org> parents: 1590 diff changeset	2718 NULL
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2719 },
1803 7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2720
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2721 {
2197 23dd0e0fe25d Enable write support for Crest Super Hires FLI unpacked format (only Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	2722 "cshf", "Crest Super Hires FLI Editor v1.0 (unpacked)", 0x4000, 15874, DM_FMT_RDWR,
2167 9d362ea1a606 Add probe function for Crest Super Hires FLI Editor v1.0 (unpacked). Matti Hamalainen <ccr@tnsp.org> parents: 2166 diff changeset	2723 fmtProbeCrestSHFLI,
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2724 NULL, NULL,
2189 83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2725 { }, &dmC64CommonFormats[11]
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2726 },
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2727
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2728 {
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2729 "cshfp", "Crest Super Hires FLI Editor v1.0 (packed)", 0xa000, 0, DM_FMT_RD,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2730 fmtProbeCrestSHFLI,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2731 fmtDecodeCrestSHFLIPacked, NULL,
83391646ff16 Add read support for packed version of Crest Super Hires FLI format. Matti Hamalainen <ccr@tnsp.org> parents: 2188 diff changeset	2732 { }, &dmC64CommonFormats[11]
2165 3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2733 },
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2734
3d3094ba21c5 Add read-only support for Crest Super Hires FLI Editor v1.0 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2164 diff changeset	2735 {
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	2736 "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	2737 fmtProbeCosmosDesignsHiresManager,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2738 NULL, NULL,
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2739 { }, &dmC64CommonFormats[8]
7df833754fd1 Add Cosmos Designs Hires Manager unpacked format support. Matti Hamalainen <ccr@tnsp.org> parents: 1802 diff changeset	2740 },
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2741
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2742 {
2151 0a7ebb7198e3 Few additional cleanups in the CDHM decoder, and mark the format support as not-broken anymore. Matti Hamalainen <ccr@tnsp.org> parents: 2150 diff changeset	2743 "cdhp", "Cosmos Designs Hires Manager (packed)", 0x4000, 0, DM_FMT_RD,
2141 009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2744 fmtProbeCosmosDesignsHiresManager,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2745 fmtDecodeCosmosDesignsHiresManagerPacked, NULL,
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2746 { }, &dmC64CommonFormats[8]
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2747 },
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2748
009ee261704c Add somewhat broken support for decoding packed Cosmos Designs Hires Manager files. Matti Hamalainen <ccr@tnsp.org> parents: 2139 diff changeset	2749 {
2378 5ea616925849 Mark Marq's newer PETSCII editor format as (new format). Matti Hamalainen <ccr@tnsp.org> parents: 2377 diff changeset	2750 "mrqp", "Marq's PETSCII editor (new format) (unpacked)", 0x0801, 0, DM_FMT_RDWR,
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2751 fmtProbeMarqPETSCII,
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2752 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	2753 {
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2754 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	2755 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	2756 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	2757 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	2758 NULL, NULL,
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2170 diff changeset	2759 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	2760 {
2134 5daed72fd211 Improve Marq's PETSCII prg export support. Matti Hamalainen <ccr@tnsp.org> parents: 2133 diff changeset	2761 // For offset values see petscii/m_c64.pde :: save_prg()
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	2762 { DO_FUNC , 0 , 20 - 2, 0, 0, 0, NULL, fmtEncodeMarqPETSCIIData, DF_NORMAL },
2287 631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	2763 { DO_COPY , DS_SCREEN_RAM , 0x60 , 0, 0, 0, NULL, NULL, DF_NORMAL },
631bbd451d08 Add write support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	2764 { DO_COPY , DS_COLOR_RAM , 0x60 + 1000,0,0, 0, NULL, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2765 { DO_SET_MEM_LO , DS_D020 , 25 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2766 { DO_SET_MEM_LO , DS_BGCOL , 30 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	2767 { DO_FUNC , 0 , 20 - 2, 0, 0, 0, fmtDecodeHiresPETSCIICharsetData, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2768
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2769 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2130 3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2770 }
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2771 },
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2772 NULL
3b5be00759ed Add initial (and incomplete) support for Marq's PETSCII editor PRG export format. Matti Hamalainen <ccr@tnsp.org> parents: 2129 diff changeset	2773 },
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	2774
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2775 {
2377 d8889ff223b6 UPETSCII is actually old version of Marq's PETSCII editor. Matti Hamalainen <ccr@tnsp.org> parents: 2371 diff changeset	2776 "mqpo", "Marq's PETSCII editor (old format) (unpacked)", 0x0801, 2499, DM_FMT_RD,
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2777 NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2778 NULL, NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2779 {
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2780 D64_FMT_HIRES \| D64_FMT_CHAR,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2781 D64_SCR_WIDTH , D64_SCR_HEIGHT,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2782 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2783 1, 1,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2784 NULL, NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2785 NULL,
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2786 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2787 { DO_COPY , DS_SCREEN_RAM , 0x01ab, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2788 { DO_COPY , DS_COLOR_RAM , 0x01ab + 1000, 0, 0, 0, NULL, NULL, DF_NORMAL },
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2789
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2790 { DO_SET_MEM_LO , DS_D020 , 0x01a9, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2791 { DO_SET_MEM_LO , DS_BGCOL , 0x01aa, 0, 0, 0, NULL, NULL, DF_NORMAL },
2377 d8889ff223b6 UPETSCII is actually old version of Marq's PETSCII editor. Matti Hamalainen <ccr@tnsp.org> parents: 2371 diff changeset	2792 { DO_FUNC , 0 , 0 , 0, 0, 0, fmtDecodeMarqOldData, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2793
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2794 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2173 a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2795 }
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2796 },
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2797 NULL
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2798 },
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2799
a5c4eb5c7309 Add read support for unknown PETSCII PRG export format (could be earlier version Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	2800 {
2138 fdd0fd7dc0e6 Some more work on charmap and PETSCII support. Matti Hamalainen <ccr@tnsp.org> parents: 2135 diff changeset	2801 "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	2802 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	2803 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	2804 {
2139 84780a9d8d17 Improve and fix charmap format decoding. Matti Hamalainen <ccr@tnsp.org> parents: 2138 diff changeset	2805 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	2806 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	2807 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	2808 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	2809 NULL, NULL,
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2170 diff changeset	2810 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	2811 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2812 { DO_COPY , DS_SCREEN_RAM , 0x2001 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2813 { DO_COPY , DS_COLOR_RAM , 0x23e9 - 2, 0, 0, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2814
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2815 { DO_COPY , DS_EXTRA_DATA , 0x0000 , 0, 0x0100, 0, NULL, NULL, DF_NORMAL },
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2816 { DO_COPY , DS_CHAR_DATA , 0x1801 - 2, 0, 0x0800, 0, NULL, NULL, DF_NORMAL },
2366 1e6e018b6487 Rename some functions to be more consistent with their intent. Matti Hamalainen <ccr@tnsp.org> parents: 2363 diff changeset	2817 { DO_FUNC , 0 , 0 , 0, 0 , 0, fmtDecodePetsciiKrisszHuData, NULL, DF_NORMAL },
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2818
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2195 diff changeset	2819 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
2135 cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2820 }
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2821 },
cb4689d9ceed Add initial (and incomplete) support for petscii.krissz.hu PETSCII editor PRG export files. Matti Hamalainen <ccr@tnsp.org> parents: 2134 diff changeset	2822 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	2823 },
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2824
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2825 {
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	2826 "poca", "Petscii Coca editor (unpacked)", 0x0801, 0, DM_FMT_RDWR,
36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	2827 fmtProbeCocaPETSCII,
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2828 NULL, NULL,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2829 {
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2830 D64_FMT_HIRES \| D64_FMT_CHAR,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2831 D64_SCR_WIDTH , D64_SCR_HEIGHT,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2832 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2833 1, 1,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2834 NULL, NULL,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2835 NULL,
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2836 {
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	2837 { DO_FUNC , 0 , 0x0c44 - 0x0801, 0, 0, 0, NULL, fmtEncodeCocaPETSCIIData, DF_NORMAL },
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2838 { DO_COPY , DS_SCREEN_RAM , 0x085a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2839 { DO_COPY , DS_COLOR_RAM , 0x0c5a - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2367 36226425aac1 Fix Petscii Coca editor format writing. Matti Hamalainen <ccr@tnsp.org> parents: 2366 diff changeset	2840
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2841 { DO_SET_MEM_LO , DS_D020 , 0x0c42 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2842 { DO_SET_MEM_LO , DS_BGCOL , 0x0c43 - 0x0801, 0, 0, 0, NULL, NULL, DF_NORMAL },
2368 4cd67faadbd3 Fix encoding and improve decoding of character set case (upper/lower) for two PETSCII formats. Also generalize the functions a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2367 diff changeset	2843 { DO_FUNC , 0 , 0x0c44 - 0x0801, 0, 0, 0, fmtDecodeHiresPETSCIICharsetData, NULL, DF_NORMAL },
2362 6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2844
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2845 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2846 }
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2847 },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2848 NULL
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2849 },
6119b9b560fb Add support for Petscii Coca (Cola) format. Matti Hamalainen <ccr@tnsp.org> parents: 2343 diff changeset	2850
2399 5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2851 {
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2852 "acpe", "Abyss Connection PETSCII-Editor 4.61 (unpacked)", 0x3000, 2026, DM_FMT_RDWR,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2853 NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2854 NULL, NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2855 {
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2856 D64_FMT_HIRES \| D64_FMT_CHAR,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2857 D64_SCR_WIDTH , D64_SCR_HEIGHT,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2858 D64_SCR_CH_WIDTH, D64_SCR_CH_HEIGHT,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2859 1, 1,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2860 NULL, NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2861 NULL,
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2862 {
2428 09082816665d Fix write support of Abyss Connection PETSCII-Editor 4.61 (unpacked) format. Matti Hamalainen <ccr@tnsp.org> parents: 2399 diff changeset	2863 { DO_FUNC , 0 , 0x33ea - 0x3000, 0, 0, 0, NULL, fmtEncodeHiresPETSCIICharsetData, DF_NORMAL },
2399 5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2864 { DO_COPY , DS_SCREEN_RAM , 0x0000 , 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2865 { DO_COPY , DS_COLOR_RAM , 0x0400 , 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2866
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2867 { DO_SET_MEM_LO , DS_D020 , 0x33e8 - 0x3000, 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2868 { DO_SET_MEM_LO , DS_BGCOL , 0x33e9 - 0x3000, 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2869 { DO_FUNC , 0 , 0x33ea - 0x3000, 0, 0, 0, fmtDecodeHiresPETSCIICharsetData, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2870
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2871 { DO_LAST , 0 , 0 , 0, 0, 0, NULL, NULL, DF_NORMAL },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2872 }
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2873 },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2874 NULL
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2875 },
5d391c31ebc9 Add support for Abyss Connection PETSCII-Editor 4.61 (unpacked) raw file format. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	2876
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2877 };
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2878
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2879 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	2880

Mercurial > hg > dmlib

annotate tools/lib64fmts.c @ 2428:09082816665d