dmlib: tools/lib64gfx.c annotate

annotate tools/lib64gfx.c @ 1463:bde6a66bc2f6

Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support for two different common types of RLE encoding. Add stub function of dmEncodeGenericRLE(), not implemented yet. Change functions using dmDecodeGenericRLE to use the new API. Also fix a problem in Amica Paint RLE decoding as the format seems to save one byte less than is necessary.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 10 May 2018 21:27:24 +0300
parents	9cb6dd1046bf
children	88845f95e791

rev	line source
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Functions for reading and converting various restricted
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * C64/etc and/or indexed/paletted graphics formats.
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * Programmed and designed by Matti 'ccr' Hamalainen
1456 42fb39da7dde Bump copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 1448 diff changeset	5 * (C) Copyright 2012-2018 Tecnic Software productions (TNSP)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 *
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 * Please read file 'COPYING' for information on license and distribution.
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 */
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "lib64gfx.h"
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	10
514 c9b9f912acfb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 513 diff changeset	11 #define BUF_SIZE_INITIAL (16*1024)
c9b9f912acfb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 513 diff changeset	12 #define BUF_SIZE_GROW (4*1024)
c9b9f912acfb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 513 diff changeset	13
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	15 // Based on Pepto's palette, stolen from VICE
1426 4c7b456d7f0b Rename global dmC64Palette to dmDefaultC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 1425 diff changeset	16 DMColor dmDefaultC64Palette[C64_NCOLORS] =
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	17 {
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	18 { 0x00, 0x00, 0x00, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	19 { 0xFF, 0xFF, 0xFF, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	20 { 0x68, 0x37, 0x2B, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	21 { 0x70, 0xA4, 0xB2, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	22 { 0x6F, 0x3D, 0x86, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	23 { 0x58, 0x8D, 0x43, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	24 { 0x35, 0x28, 0x79, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	25 { 0xB8, 0xC7, 0x6F, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	26 { 0x6F, 0x4F, 0x25, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	27 { 0x43, 0x39, 0x00, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	28 { 0x9A, 0x67, 0x59, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	29 { 0x44, 0x44, 0x44, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	30 { 0x6C, 0x6C, 0x6C, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	31 { 0x9A, 0xD2, 0x84, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	32 { 0x6C, 0x5E, 0xB5, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	33 { 0x95, 0x95, 0x95, 0xff },
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	34 };
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	35
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	36 #define DM_RLE_MARKER 1
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	37 #define DM_RLE_MASK 2
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	38
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	39
1461 96c254579b82 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1460 diff changeset	40 #define DM_GET_ADDR_LO(addr) ((addr) & 0xff)
96c254579b82 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1460 diff changeset	41 #define DM_GET_ADDR_HI(addr) (((addr) >> 8) & 0xff)
96c254579b82 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1460 diff changeset	42
96c254579b82 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1460 diff changeset	43
1457 dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	44 void dmSetDefaultC64Palette(DMImage *img)
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	45 {
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	46 img->constpal = TRUE;
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	47 img->pal = dmDefaultC64Palette;
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	48 img->ncolors = C64_NCOLORS;
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	49 img->ctransp = 255;
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	50 }
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	51
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	52
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	53 static BOOL dmCompareAddr16(const Uint8 *buf, const size_t offs, const Uint16 addr)
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	54 {
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	55 return buf[offs ] == DM_GET_ADDR_LO(addr) &&
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	56 buf[offs + 1] == DM_GET_ADDR_HI(addr);
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	57 }
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	58
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	59
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	60 int dmC64ImageGetNumBanks(const DMC64ImageFormat *fmt)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	61 {
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	62 int nbanks = 0;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	63 for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	64 {
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	65 const DMC64EncDecOp *op = &fmt->encdecOps[i];
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	66 if (op->type == DT_LAST)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	67 break;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	68
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	69 if (op->bank > nbanks)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	70 nbanks = op->bank;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	71 }
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	72
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	73 return nbanks + 1;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	74 }
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	75
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	76
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	77 DMC64Image dmC64ImageAlloc(const DMC64ImageFormat fmt)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	78 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	79 DMC64Image *img = dmMalloc0(sizeof(DMC64Image));
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	80
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	81 if (img == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	82 return NULL;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	83
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	84 // Initialize image information
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	85 img->width = fmt->width;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	86 img->height = fmt->height;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	87 img->ch_width = fmt->ch_width;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	88 img->ch_height = fmt->ch_height;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	89 img->nbanks = dmC64ImageGetNumBanks(fmt);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	90
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	91 // Allocate banks
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	92 if ((img->color = dmCalloc(img->nbanks, sizeof(Uint8 *))) == NULL \|\|
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	93 (img->bitmap = dmCalloc(img->nbanks, sizeof(Uint8 *))) == NULL \|\|
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	94 (img->screen = dmCalloc(img->nbanks, sizeof(Uint8 *))) == NULL \|\|
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	95 (img->charmem = dmCalloc(img->nbanks, sizeof(Uint8 *))) == NULL)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	96 goto err;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	97
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	98 for (int i = 0; i < img->nbanks; i++)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	99 {
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	100 if ((img->color[i] = dmMalloc0(img->ch_width * img->ch_height)) == NULL)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	101 goto err;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	102
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	103 if ((img->bitmap[i] = dmMalloc0(img->ch_width * img->ch_height * 8)) == NULL)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	104 goto err;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	105
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	106 if ((img->screen[i] = dmMalloc0(img->ch_width * img->ch_height)) == NULL)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	107 goto err;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	108
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	109 if ((img->charmem[i] = dmMalloc0(C64_MAX_CHARS * C64_CHR_SIZE)) == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	110 goto err;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	111 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	112
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	113 return img;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	114
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	115 err:
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	116 dmC64ImageFree(img);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	117 return NULL;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	118 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	119
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	120
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	121 void dmC64ImageFree(DMC64Image *img)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	122 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	123 if (img != NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	124 {
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	125 // Free the allocated areas
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	126 for (int i = 0; i < img->nbanks; i++)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	127 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	128 dmFree(img->color[i]);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	129 dmFree(img->bitmap[i]);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	130 dmFree(img->screen[i]);
932 6320bf08e302 Oops, plug a memory leak. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	131 dmFree(img->charmem[i]);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	132 }
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	133
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	134 // Free the pointers to the areas
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	135 dmFree(img->color);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	136 dmFree(img->bitmap);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	137 dmFree(img->screen);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	138 dmFree(img->charmem);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	139
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	140 // Extra data ..
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	141 for (int i = 0; i < C64_MAX_EXTRA_DATA; i++)
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	142 dmFree(img->extraData[i]);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	143
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	144 dmMemset(img, 0, sizeof(DMC64Image));
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	145 dmFree(img);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	146 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	147 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	148
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	149
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	150 char * dmC64GetImageTypeString(char *buf, const size_t len, const int type)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 {
1425 f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	152 snprintf(buf, len,
f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	153 "%s%s%s%s",
f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	154 (type & D64_FMT_FLI) ? "FLI " : "",
f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	155 (type & D64_FMT_MC) ? "MCol " : "HiRes ",
f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	156 (type & D64_FMT_ILACE) ? "Ilace " : "",
f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	157 (type & D64_FMT_CHAR) ? "CharMap" : ""
f08c4ace528d Simplify dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1419 diff changeset	158 );
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	159
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	160 return buf;
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	161 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	164 int dmC64ConvertCSDataToImage(DMImage *img,
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	165 int xoffs, int yoffs, const Uint8 *buf,
915 ba6b210c9bf4 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 912 diff changeset	166 int width, int height, BOOL multicolor,
ba6b210c9bf4 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 912 diff changeset	167 int *colors)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 int yc, widthpx = width * 8;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	170 Uint8 *dp;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 if (img == NULL)
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	173 return DMERR_NULLPTR;
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	174
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	175 if (xoffs < 0 \|\| yoffs < 0 \|\|
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	176 xoffs > img->width - widthpx \|\|
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 yoffs > img->height - height)
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	178 return DMERR_INVALID_ARGS;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 dp = img->data + (yoffs * img->pitch) + xoffs;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 if (multicolor)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 for (yc = 0; yc < height; yc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 const int offs = yc * width;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 int xc;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	188 Uint8 *d = dp;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 for (xc = 0; xc < widthpx / 2; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 const int b = buf[offs + (xc / 4)];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 const int v = 6 - ((xc * 2) & 6);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	194 const Uint8 c = colors[(b >> v) & 3];
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	195
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 *d++ = c;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 *d++ = c;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 dp += img->pitch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 for (yc = 0; yc < height; yc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 const int offs = yc * width;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 int xc;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	209 Uint8 *d = dp;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 for (xc = 0; xc < widthpx; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213 const int b = buf[offs + (xc / 8)];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 const int v = 7 - (xc & 7);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	215 const Uint8 c = colors[(b >> v) & 1];
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	216
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 *d++ = c;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 dp += img->pitch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 }
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	223
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	224 return DMERR_OK;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	228 static int dmDecodeGenericRLE(DMGrowBuf dst, const Uint8 src, const Uint8 *srcEnd, const Uint8 rleMarker, const Uint8 rleMask, const int rleType)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 {
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	230 int res;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	232 if ((res = dmGrowBufAlloc(dst, BUF_SIZE_INITIAL, BUF_SIZE_GROW)) != DMERR_OK)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	233 goto err;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	234
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	235 // Perform RLE decode
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	236 while (src < srcEnd)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 {
1412 c386d287fa1e Use Uint8 instead of int in the rle decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1411 diff changeset	238 Uint8 c = *src++;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	239 int cnt = 1;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	240
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	241 switch (rleType)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242 {
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	243 case DM_RLE_MARKER:
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	244 if (c == rleMarker)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	245 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	246 if (srcEnd - src < 2)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	247 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	248 res = dmError(DMERR_INVALID_DATA,
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	249 "Foobar: %d\n", srcEnd - src);
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	250 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	251 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	252 cnt = *src++;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	253 c = *src++;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	254 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	255 break;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	256
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	257 case DM_RLE_MASK:
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	258 if ((c & rleMask) == rleMarker)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	259 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	260 if (srcEnd - src < 1)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	261 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	262 res = dmError(DMERR_INVALID_DATA,
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	263 "foobar2\n");
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	264 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	265 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	266 // XXX TODO actually we probably want another mask here
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	267 cnt = c & (0xff ^ rleMask);
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	268 c = *src++;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	269 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	270 break;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 }
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	272
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	273 while (cnt--)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	274 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	275 if (!dmGrowBufPutU8(dst, c))
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	276 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	277 res = dmError(DMERR_MALLOC,
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	278 "bazzooo\n");
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	279 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	280 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	281 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 }
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	283
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	284 // Reallocate the memory
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	285 if ((res = dmGrowBufResize(dst)) != DMERR_OK)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	286 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	287
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	288 res = DMERR_OK;
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	289
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	290 err:
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	291 return res;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	292 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	293
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	294
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	295 static int dmEncodeGenericRLE(DMGrowBuf dst, const Uint8 src, const Uint8 *srcEnd, const Uint8 rleMarker)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	296 {
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	297 (void) dst;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	298 (void) src;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	299 (void) srcEnd;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	300 (void) rleMarker;
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	301 return DMERR_OK;
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	302 }
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	303
519 feaaf0e2ecbe Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	304
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	305 static inline Uint8 dmC64GetGenericSCPixel(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	306 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	307 const int vshift, const int vbank, const int vbitmap, const int cbank)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	308 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	309 (void) cbank;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	310 if ((img->bitmap[vbitmap][bmoffs] >> vshift) & 1)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	311 return img->screen[vbank][scroffs] >> 4;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	312 else
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	313 return img->screen[vbank][scroffs] & 15;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	314 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	315
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	316
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	317 static inline Uint8 dmC64GetGenericMCPixel(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	318 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	319 const int vshift, const int vbank, const int vbitmap, const int cbank)
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	320 {
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	321 switch ((img->bitmap[vbitmap][bmoffs] >> vshift) & 3)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	322 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	323 case 0: return img->bgcolor; break;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	324 case 1: return img->screen[vbank][scroffs] >> 4; break;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	325 case 2: return img->screen[vbank][scroffs] & 15; break;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	326 default: return img->color[cbank][scroffs] & 15; break;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	327 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	328 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	329
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	330
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	331 static inline Uint8 fmtGetGenericSCPixel(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	332 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	333 const int vshift, const int vbitmap, const int raster)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	334 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	335 (void) raster;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	336 return dmC64GetGenericSCPixel(img, bmoffs, scroffs, vshift, 0, vbitmap, 0);
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	337 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	338
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	339
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	340 static inline Uint8 fmtGetGenericMCPixel(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	341 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	342 const int vshift, const int vbitmap, const int raster)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	343 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	344 (void) raster;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	345 return dmC64GetGenericMCPixel(img, bmoffs, scroffs, vshift, 0, vbitmap, 0);
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	346 }
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	347
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	348
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	349 static int fmtProbeDrazPaint20Packed(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	350 {
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	351 const char ident = (const char ) buf + 2;
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	352
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	353 if (len > 22 &&
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	354 dmCompareAddr16(buf, 0, fmt->addr) &&
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	355 strncmp(ident, "DRAZPAINT ", 10) == 0 &&
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	356 ident[11] == '.' && (
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	357 (ident[10] == '1' && ident[12] == '4') \|\|
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	358 (ident[10] == '2' && ident[12] == '0')
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	359 ))
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	360 return DM_PROBE_SCORE_MAX;
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	361
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	362 return DM_PROBE_SCORE_FALSE;
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	363 }
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	364
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	365
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	366 static int fmtDecodeDrazPaintPacked(DMC64Image img, const Uint8 buf, const size_t len, const DMC64ImageFormat *fmt)
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	367 {
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	368 int res;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	369 DMGrowBuf mem;
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	370
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	371 if ((res = dmDecodeGenericRLE(&mem, buf + 0x0e, buf + len, *(buf + 0x0d), 0, DM_RLE_MARKER)) != DMERR_OK)
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	372 goto out;
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	373
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	374 res = dmC64DecodeGenericBMP(img, mem.data, mem.len, fmt);
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	375
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	376 out:
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	377 dmGrowBufFree(&mem);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	382 static int fmtProbeDrazLace10Packed(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383 {
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	384 if (len > 22 &&
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	385 dmCompareAddr16(buf, 0, fmt->addr) &&
1382 558776ee9603 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1381 diff changeset	386 strncmp((const char *) (buf + 2), "DRAZLACE! 1.0", 13) == 0)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 return DM_PROBE_SCORE_MAX;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	388
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 return DM_PROBE_SCORE_FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	393 static BOOL fmtDrazLaceSetLaceType(DMC64Image img, const struct _DMC64EncDecOp op, const Uint8 *buf, const size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	395 (void) len;
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	396 img->laceType = buf[op->offs] ? D64_ILACE_RES : D64_ILACE_COLOR;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 return TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	401 static int fmtProbeGunPaint(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	402 {
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	403 if (len > 0x400 &&
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	404 dmCompareAddr16(buf, 0, fmt->addr) &&
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	405 strncmp((const char *) (buf + 0x3ea), "GUNPAINT (JZ) ", 14) == 0)
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	406 return DM_PROBE_SCORE_MAX;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	407
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	408 return DM_PROBE_SCORE_FALSE;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	409 }
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	410
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	411
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	412 static int fmtProbeAmicaPaintPacked(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 {
541 7ca6abbbbb40 Use size_t instead of int here to avoid signedness issues. Matti Hamalainen <ccr@tnsp.org> parents: 540 diff changeset	414 size_t i, n;
1433 d8a83582f78f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1426 diff changeset	415
1392 aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	416 if (len < 2048 \|\| !dmCompareAddr16(buf, 0, fmt->addr))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 return DM_PROBE_SCORE_FALSE;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	418
494 abb112ac9916 Prevent false positive probes of certain Interpaint files as Amica Paint Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	419 // Interpaint Hi-Res gives a false positive
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	420 // as do some GunPaint images ..
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	421 if (len == 9002 \|\| fmtProbeGunPaint(buf, len, fmt) > DM_PROBE_SCORE_GOOD)
494 abb112ac9916 Prevent false positive probes of certain Interpaint files as Amica Paint Matti Hamalainen <ccr@tnsp.org> parents: 468 diff changeset	422 return DM_PROBE_SCORE_FALSE;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	423
533 91e2d0d74e2f Adjust packed Amica paint format probe function to return less false Matti Hamalainen <ccr@tnsp.org> parents: 532 diff changeset	424 for (n = 0, i = 2; i < len; i++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 if (buf[i] == 0xC2) n++;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	426
533 91e2d0d74e2f Adjust packed Amica paint format probe function to return less false Matti Hamalainen <ccr@tnsp.org> parents: 532 diff changeset	427 if (n > 50)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 return DM_PROBE_SCORE_GOOD;
533 91e2d0d74e2f Adjust packed Amica paint format probe function to return less false Matti Hamalainen <ccr@tnsp.org> parents: 532 diff changeset	429 if (n > 25)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 return DM_PROBE_SCORE_AVG;
533 91e2d0d74e2f Adjust packed Amica paint format probe function to return less false Matti Hamalainen <ccr@tnsp.org> parents: 532 diff changeset	431 if (n > 10)
91e2d0d74e2f Adjust packed Amica paint format probe function to return less false Matti Hamalainen <ccr@tnsp.org> parents: 532 diff changeset	432 return DM_PROBE_SCORE_MAYBE;
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	433
533 91e2d0d74e2f Adjust packed Amica paint format probe function to return less false Matti Hamalainen <ccr@tnsp.org> parents: 532 diff changeset	434 return DM_PROBE_SCORE_FALSE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	438 static int fmtDecodeAmicaPaintPacked(DMC64Image img, const Uint8 buf, const size_t len, const DMC64ImageFormat *fmt)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 int res;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	441 DMGrowBuf mem, tmp;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	442
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	443 // Amica Paint apparently is broken and stores one byte less than it should
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	444 // so we need to do some crappy buffer expansion here ..
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	445 if ((res = dmGrowBufAlloc(&tmp, len + 4, 4)) != DMERR_OK)
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	446 return res;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	448 tmp.len = len;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	449 memcpy(tmp.data, buf, len);
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	450 tmp.data[tmp.len++] = 0;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	451
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	452 // Now do an RLE decode on the enlarged buffer
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	453 if ((res = dmDecodeGenericRLE(&mem, tmp.data, tmp.data + tmp.len, 0xC2, 0, DM_RLE_MARKER)) != DMERR_OK)
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	454 goto out;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	456 // And finally decode to bitmap struct
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	457 res = dmC64DecodeGenericBMP(img, mem.data, mem.len, fmt);
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	458
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	459 out:
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	460 dmGrowBufFree(&tmp);
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	461 dmGrowBufFree(&mem);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	465
1392 aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	466 static int fmtProbeFLIDesigner(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	467 {
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	468 if (len == fmt->size &&
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	469 (dmCompareAddr16(buf, 0, 0x3c00) \|\| dmCompareAddr16(buf, 0, 0x3ff0)))
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	470 return DM_PROBE_SCORE_MAX;
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	471
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	472 return DM_PROBE_SCORE_FALSE;
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	473 }
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	474
aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	475
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	476 static BOOL fmtTruePaintSetLaceType(DMC64Image img, const struct _DMC64EncDecOp op, const Uint8 *buf, const size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	478 (void) op;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	479 (void) buf;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	480 (void) len;
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	481 img->laceType = D64_ILACE_RES;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482 return TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	486 static Uint8 fmtGetPixelTruePaint(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	487 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	488 const int vshift, const int vbitmap, const int raster)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	489 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	490 (void) raster;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	491 return dmC64GetGenericMCPixel(img, bmoffs, scroffs, vshift, 0, vbitmap, 0);
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	492 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	493
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	494
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	495 #define XX2_MIN_SIZE 4000
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	496
943 8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	497 static int fmtProbeFormatXX2(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	498 {
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	499 if (len >= XX2_MIN_SIZE && len <= XX2_MIN_SIZE + 8 &&
943 8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	500 dmCompareAddr16(buf, 0, fmt->addr))
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	501 return DM_PROBE_SCORE_MAYBE;
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	502
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	503 return DM_PROBE_SCORE_FALSE;
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	504 }
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	505
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	506
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	507 static int fmtDecodeFormatXX2(DMC64Image img, const Uint8 buf, const size_t len, const DMC64ImageFormat *fmt)
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	508 {
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	509 int res;
1377 e274a7e6dff9 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1376 diff changeset	510
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	511 // If there is only data for less than XX2_MIN_SIZE bytes,
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	512 // allocate a buffer of that size and copy data there.
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	513 // Otherwise allocate len bytes.
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	514 size_t nlen = len < XX2_MIN_SIZE ? XX2_MIN_SIZE : len;
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	515 Uint8 *mem = dmMalloc0(nlen);
943 8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	516 if (mem == NULL)
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	517 return DMERR_MALLOC;
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	518
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	519 memcpy(mem, buf, len);
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	520 res = dmC64DecodeGenericBMP(img, mem, nlen, fmt);
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	521
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	522 dmFree(mem);
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	523 return res;
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	524 }
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	525
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	526
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	527 #define FUNPAINT2_HEADER_SIZE (0x10)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	528
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	529 static BOOL fmtProbeFunPaint2Header(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	530 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	531 return
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	532 len > 30 &&
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	533 dmCompareAddr16(buf, 0, fmt->addr) &&
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	534 strncmp((const char *) (buf + 2), "FUNPAINT (MT) ", 14) == 0;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	535 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	536
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	537
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	538 static int fmtProbeFunPaint2Unpacked(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	539 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	540 if (fmtProbeFunPaint2Header(buf, len, fmt) &&
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	541 buf[2 + 14] == 0)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	542 return DM_PROBE_SCORE_MAX;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	543 else
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	544 return DM_PROBE_SCORE_FALSE;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	545 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	546
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	547
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	548 static int fmtProbeFunPaint2Packed(const Uint8 buf, const size_t len, const DMC64ImageFormat fmt)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	549 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	550 if (fmtProbeFunPaint2Header(buf, len, fmt) &&
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	551 buf[2 + 14] != 0)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	552 return DM_PROBE_SCORE_MAX;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	553 else
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	554 return DM_PROBE_SCORE_FALSE;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	555 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	556
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	557
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	558 static int fmtDecodeFunPaint2Unpacked(DMC64Image img, const Uint8 buf, const size_t len, const DMC64ImageFormat *fmt)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	559 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	560 return dmC64DecodeGenericBMP(img, buf + FUNPAINT2_HEADER_SIZE, len - FUNPAINT2_HEADER_SIZE, fmt);
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	561 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	562
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	563
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	564 static int fmtDecodeFunPaint2Packed(DMC64Image img, const Uint8 buf, const size_t len, const DMC64ImageFormat *fmt)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	565 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	566 int res;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	567 DMGrowBuf mem;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	568 dmGrowBufInit(&mem);
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	569
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	570 if ((res = dmDecodeGenericRLE(&mem, buf + FUNPAINT2_HEADER_SIZE, buf + len, *(buf + 15), 0, DM_RLE_MARKER)) != DMERR_OK)
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	571 goto out;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	572
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	573 res = dmC64DecodeGenericBMP(img, mem.data, mem.len, fmt);
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	574
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	575 out:
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	576 dmGrowBufFree(&mem);
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	577 return res;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	578 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	579
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	580
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	581 static Uint8 fmtGetPixelFunPaint2(
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	582 const DMC64Image *img, const int bmoffs, const int scroffs,
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	583 const int vshift, const int vbitmap, const int raster)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	584 {
1390 e3794fb2df83 FunPaint2 decoding fixes. Matti Hamalainen <ccr@tnsp.org> parents: 1389 diff changeset	585 const int vbank = (raster & 7) + (vbitmap * 8);
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	586 int vr, vb;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	587 if (raster < 100)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	588 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	589 vb = 0;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	590 vr = raster;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	591 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	592 else
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	593 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	594 vb = 0;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	595 vr = raster - 100;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	596 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	597
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	598 switch ((img->bitmap[vbitmap][bmoffs] >> vshift) & 3)
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	599 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	600 case 0: return img->extraData[vb][vr] & 15; break;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	601 case 1: return img->screen[vbank][scroffs] >> 4; break;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	602 case 2: return img->screen[vbank][scroffs] & 15; break;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	603 default: return img->color[0][scroffs] & 15; break;
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	604 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	605 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	606
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	607
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	608 static Uint8 fmtGetPixelGunPaint(
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	609 const DMC64Image *img, const int bmoffs, const int scroffs,
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	610 const int vshift, const int vbitmap, const int raster)
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	611 {
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	612 const int vbank = (raster & 7);// + (vbitmap * 8);
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	613 int vr, vb;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	614 if (raster < 177)
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	615 {
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	616 vb = 0;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	617 vr = raster;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	618 }
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	619 else
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	620 {
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	621 vb = 0;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	622 vr = raster - 177;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	623 }
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	624
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	625 switch ((img->bitmap[vbitmap][bmoffs] >> vshift) & 3)
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	626 {
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	627 case 0: return img->extraData[vb][vr] & 15; break;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	628 case 1: return img->screen[vbank][scroffs] >> 4; break;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	629 case 2: return img->screen[vbank][scroffs] & 15; break;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	630 default: return img->color[0][scroffs] & 15; break;
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	631 }
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	632 }
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	633
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	634
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	635 static Uint8 fmtGetPixelBMFLI(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	636 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	637 const int vshift, const int vbitmap, const int raster)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	638 {
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	639 const int vbank = raster & 7;
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	640 switch ((img->bitmap[vbitmap][bmoffs] >> vshift) & 3)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	641 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	642 case 0: return img->extraData[0][raster]; break;
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	643 case 1: return img->screen[vbank][scroffs] >> 4; break;
959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	644 case 2: return img->screen[vbank][scroffs] & 15; break;
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	645 default: return img->color[0][scroffs] & 15; break;
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	646 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	647 }
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	648
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	649
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	650 static Uint8 fmtGetPixelFLIDesigner(
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	651 const DMC64Image *img, const int bmoffs, const int scroffs,
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	652 const int vshift, const int vbitmap, const int raster)
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	653 {
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	654 return dmC64GetGenericMCPixel(img, bmoffs, scroffs, vshift, raster & 7, vbitmap, 0);
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	655 }
943 8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	656
8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	657
1394 054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	658 static Uint8 fmtGetPixelCHFLI(
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	659 const DMC64Image *img, const int bmoffs, const int scroffs,
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	660 const int vshift, const int vbitmap, const int raster)
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	661 {
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	662 const int vbank = raster & 7;
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	663
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	664 if ((img->bitmap[vbitmap][bmoffs] >> vshift) & 1)
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	665 return img->screen[vbank][scroffs] >> 4;
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	666 else
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	667 return img->screen[vbank][scroffs] & 15;
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	668 }
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	669
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	670
1369 3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	671 //
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	672 // Array with data for supported formats
3a94c0e8297f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1366 diff changeset	673 //
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	674 #define DEF_SCREEN_RAM(start, oindex, bindex, osize) { DT_SCREEN_RAM, (start) + ((osize) * (oindex)), (bindex), 0, NULL, NULL }
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	675 #define DEF_SCREEN_RAMS_8(start, sindex, osize) \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	676 DEF_SCREEN_RAM((start), 0, (sindex + 0), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	677 DEF_SCREEN_RAM((start), 1, (sindex + 1), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	678 DEF_SCREEN_RAM((start), 2, (sindex + 2), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	679 DEF_SCREEN_RAM((start), 3, (sindex + 3), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	680 DEF_SCREEN_RAM((start), 4, (sindex + 4), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	681 DEF_SCREEN_RAM((start), 5, (sindex + 5), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	682 DEF_SCREEN_RAM((start), 6, (sindex + 6), (osize)), \
b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	683 DEF_SCREEN_RAM((start), 7, (sindex + 7), (osize)),
1388 4f81528aa4f6 Simplify some image format definitions by using macro to define screen ram blocks. Matti Hamalainen <ccr@tnsp.org> parents: 1387 diff changeset	684
4f81528aa4f6 Simplify some image format definitions by using macro to define screen ram blocks. Matti Hamalainen <ccr@tnsp.org> parents: 1387 diff changeset	685
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	686 const DMC64ImageFormat dmC64ImageFormats[] =
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 {
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	689 D64_FMT_MC, "d2p", "DrazPaint 2.0 (packed)", 0x5800, 0,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	690 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	691 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1443 57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	692 fmtProbeDrazPaint20Packed,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	693 fmtDecodeDrazPaintPacked, NULL,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	694 NULL, NULL,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	695 NULL,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	697 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	698 { DT_BITMAP, 0x0800, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	699 { DT_SCREEN_RAM, 0x0400, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	700 { DT_COLOR_REG, 0x2740, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	701 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 },
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 {
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	706 D64_FMT_MC \| D64_FMT_ILACE, "dlp", "DrazLace 1.0 (packed)", 0x5800, 0,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	707 C64_SCR_WIDTH , C64_SCR_HEIGHT,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	708 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
1443 57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	709 fmtProbeDrazLace10Packed,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	710 fmtDecodeDrazPaintPacked, NULL,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	711 NULL, NULL,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	712 NULL,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	713 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	714 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	715 { DT_BITMAP, 0x0800, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	716 { DT_SCREEN_RAM, 0x0400, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	717 { DT_COLOR_REG, 0x2740, 0, DC_BGCOL, NULL, NULL },
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	718 { DT_BITMAP, 0x2800, 1, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	719 { DT_DEC_FUNCTION, 0x2742, 0, 1, fmtDrazLaceSetLaceType, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	720 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 },
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	723
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	725 D64_FMT_MC, "drp", "DrazPaint (unpacked)", 0x5800, 10051,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	726 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	727 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	728 NULL,
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	729 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	730 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	731 NULL,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	733 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	734 { DT_BITMAP, 0x0800, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	735 { DT_SCREEN_RAM, 0x0400, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	736 { DT_COLOR_REG, 0x2740, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	737 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	739 },
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	742 D64_FMT_MC \| D64_FMT_ILACE, "drl", "DrazLace 1.0 (unpacked)", 0x5800, 18242,
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	743 C64_SCR_WIDTH , C64_SCR_HEIGHT,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	744 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	745 NULL,
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	746 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	747 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	748 NULL,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	750 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	751 { DT_BITMAP, 0x0800, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	752 { DT_SCREEN_RAM, 0x0400, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	753 { DT_COLOR_REG, 0x2740, 0, DC_BGCOL, NULL, NULL },
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	754 { DT_BITMAP, 0x2800, 1, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	755 { DT_DEC_FUNCTION, 0x2742, 0, 1, fmtDrazLaceSetLaceType, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	756 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	757 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 },
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	759
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	761 D64_FMT_MC \| D64_FMT_ILACE, "mci", "Truepaint (unpacked)", 0x9c00, 19434,
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	762 C64_SCR_WIDTH , C64_SCR_HEIGHT,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	763 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	764 NULL,
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	765 NULL, NULL,
1443 57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	766 NULL, NULL,
57e97e58cbf3 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1442 diff changeset	767 fmtGetPixelTruePaint,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	769 { DT_SCREEN_RAM, 0x0000, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	770 { DT_COLOR_REG, 0x03e8, 0, DC_BGCOL, NULL, NULL },
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	771 { DT_BITMAP, 0x0400, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	772 { DT_BITMAP, 0x2400, 1, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	773 { DT_SCREEN_RAM, 0x4400, 1, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	774 { DT_COLOR_RAM, 0x4800, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	775 { DT_DEC_FUNCTION, 0x0000, 0, 0, fmtTruePaintSetLaceType, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	776 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 },
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	779
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	781 D64_FMT_MC, "kla", "Koala Paint (unpacked)", 0x6000, 10003,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	782 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	783 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	784 NULL,
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	785 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	786 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	787 NULL,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	788 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	789 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	790 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	791 { DT_COLOR_RAM, 0x2328, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	792 { DT_COLOR_REG, 0x2710, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	793 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 },
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	798 D64_FMT_MC, "ocp", "Advanced Art Studio (unpacked)", 0x2000, 10018,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	799 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	800 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	801 NULL,
524 78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	802 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	803 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	804 NULL,
524 78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	805 {
78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	806 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	807 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	808 { DT_COLOR_RAM, 0x2338, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	809 { DT_COLOR_REG, 0x2329, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	810 { DT_LAST, 0, 0, 0, NULL, NULL },
524 78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	811 }
78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	812 },
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	813
524 78edb9710ab7 Add Advanced Art Studio format support. Matti Hamalainen <ccr@tnsp.org> parents: 523 diff changeset	814 {
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	815 D64_FMT_MC, "ami", "Amica Paint (packed)", 0x4000, 0,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	816 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	817 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	818 fmtProbeAmicaPaintPacked,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	819 fmtDecodeAmicaPaintPacked, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	820 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	821 NULL,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822 {
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	823 { DT_COLOR_RAM, 0x2328, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	824 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	825 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	826 { DT_COLOR_REG, 0x2710, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	827 { DT_LAST, 0, 0, 0, NULL, NULL },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 },
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	830
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	831 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	832 D64_FMT_MC, "rpm", "Run Paint (unpacked)", 0x6000, 10006,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	833 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	834 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	835 NULL,
527 49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	836 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	837 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	838 NULL,
527 49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	839 {
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	840 { DT_COLOR_RAM, 0x2328, 0, 0, NULL, NULL },
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	841 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	842 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	843 { DT_COLOR_REG, 0x2710, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	844 { DT_LAST, 0, 0, 0, NULL, NULL },
527 49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	845 }
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	846 },
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	847
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	848 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	849 D64_FMT_HIRES, "art", "Art Studio (unpacked)", 0x2000, 9009,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	850 C64_SCR_WIDTH , C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	851 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	852 NULL,
527 49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	853 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	854 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	855 NULL,
527 49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	856 {
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	857 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	858 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	859 { DT_LAST, 0, 0, 0, NULL, NULL },
527 49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	860 }
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	861 },
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	862
49666bb544b9 Add Run Paint MC unpacked format and Art Studio hires format. Matti Hamalainen <ccr@tnsp.org> parents: 526 diff changeset	863 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	864 D64_FMT_HIRES, "iph", "Interpaint (unpacked)", 0x4000, 9002,
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	865 C64_SCR_WIDTH , C64_SCR_HEIGHT,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	866 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	867 NULL,
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	868 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	869 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	870 NULL,
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	871 {
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	872 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	873 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	874 { DT_LAST, 0, 0, 0, NULL, NULL },
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	875 }
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	876 },
1396 7acadc08bc72 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1394 diff changeset	877
1370 53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	878 {
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	879 D64_FMT_MC, "ipc", "Interpaint MC (unpacked)", 0x4000, 10003,
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	880 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	881 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	882 NULL,
1370 53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	883 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	884 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	885 NULL,
1370 53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	886 {
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	887 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	888 { DT_SCREEN_RAM, 0x1f40, 0, 0, NULL, NULL },
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	889 { DT_COLOR_RAM, 0x2328, 0, 0, NULL, NULL },
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	890 { DT_COLOR_REG, 0x2710, 0, DC_BGCOL, NULL, NULL },
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	891 { DT_LAST, 0, 0, 0, NULL, NULL },
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	892 }
53358cc2f9ff Add support for Interpaint Multicolor (unpacked) images. Matti Hamalainen <ccr@tnsp.org> parents: 1369 diff changeset	893 },
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	894
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	895 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	896 D64_FMT_HIRES, "dd", "Doodle (unpacked)", 0x1c00, 9218,
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	897 C64_SCR_WIDTH , C64_SCR_HEIGHT,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	898 C64_SCR_CH_WIDTH, C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	899 NULL,
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	900 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	901 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	902 NULL,
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	903 {
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	904 { DT_SCREEN_RAM, 0x0000, 0, 0, NULL, NULL },
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	905 { DT_BITMAP, 0x0400, 0, 0, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	906 { DT_LAST, 0, 0, 0, NULL, NULL },
526 f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	907 }
f7df57cafdd9 Add support for Interpaint (unpacked) and Doodle (unpacked) hires formats. Matti Hamalainen <ccr@tnsp.org> parents: 525 diff changeset	908 },
905 b83868a23ca5 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 904 diff changeset	909
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	910 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 533 diff changeset	911 D64_FMT_MC \| D64_FMT_FLI, "bml", "Blackmail FLI (unpacked)", 0x3b00, 17474,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	912 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	913 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	914 NULL,
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	915 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	916 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	917 fmtGetPixelBMFLI,
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	918 {
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	919 { DT_EXTRA_DATA, 0x0000, 0, 200, NULL, NULL },
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	920 { DT_COLOR_RAM, 0x0100, 0, 0, NULL, NULL },
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	921 DEF_SCREEN_RAMS_8( 0x0500, 0, 0x400)
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	922 { DT_BITMAP, 0x2500, 0, 0, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	923 { DT_LAST, 0, 0, 0, NULL, NULL },
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	924 }
2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	925 },
2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	926
2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	927 {
1392 aad9d9e7e1d3 Cleanups, support another variant of FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1390 diff changeset	928 D64_FMT_MC \| D64_FMT_FLI, "fli", "FLI Designer (unpacked)", 0, 17409,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	929 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	930 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	931 fmtProbeFLIDesigner,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	932 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	933 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	934 fmtGetPixelFLIDesigner,
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	935 {
2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	936 { DT_COLOR_RAM, 0x0000, 0, 0, NULL, NULL },
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	937 DEF_SCREEN_RAMS_8( 0x0400, 0, 0x400)
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	938 { DT_BITMAP, 0x2400, 0, 0, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	939 { DT_LAST, 0, 0, 0, NULL, NULL },
531 2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	940 }
2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	941 },
2ac364d0ace9 Add support for converting some FLI formats, such as Blackmail FLI and FLI Designer FLI. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	942
906 e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	943 {
e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	944 D64_FMT_MC, "xx1", "Unknown $2000 format (unpacked)", 0x2000, 10242,
939 5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	945 C64_SCR_WIDTH / 2, C64_SCR_HEIGHT,
5e820addd035 Fix the multicolor bitmap widths. Matti Hamalainen <ccr@tnsp.org> parents: 935 diff changeset	946 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	947 NULL,
906 e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	948 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	949 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	950 NULL,
906 e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	951 {
e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	952 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	953 { DT_SCREEN_RAM, 0x2000, 0, 0, NULL, NULL },
e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	954 { DT_COLOR_RAM, 0x2400, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	955 { DT_COLOR_SET, 0x00 , 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	956 { DT_LAST, 0, 0, 0, NULL, NULL },
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	957 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	958 },
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	959
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	960 #define XX2_WIDTH_CH 40
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	961 #define XX2_HEIGHT_CH 10
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	962 #define XX2_SIZE (XX2_WIDTH_CH * XX2_HEIGHT_CH)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	963 #define XX2_BSIZE (XX2_SIZE * 8)
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	964
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	965 {
943 8eacbc38b043 Add kludge to allow more lax handling of the "unknown" $2000 format. Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	966 D64_FMT_MC, "xx2", "Unknown $2000 format (unpacked)", 0x2000, 0,
924 732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	967 XX2_WIDTH_CH * 4, XX2_HEIGHT_CH * 8,
732787cccca8 Add dimension (w/h) information fields to C64 image format struct. Matti Hamalainen <ccr@tnsp.org> parents: 923 diff changeset	968 XX2_WIDTH_CH , XX2_HEIGHT_CH,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	969 fmtProbeFormatXX2,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	970 fmtDecodeFormatXX2, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	971 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	972 NULL,
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	973 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	974 { DT_BITMAP, 0x0000, 0, XX2_BSIZE, NULL, NULL },
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	975 { DT_COLOR_RAM, XX2_BSIZE + XX2_SIZE, 0, XX2_SIZE, NULL, NULL },
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	976 { DT_SCREEN_RAM, XX2_BSIZE, 0, XX2_SIZE, NULL, NULL },
1382 558776ee9603 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1381 diff changeset	977 { DT_COLOR_SET, 11, 0, DC_BGCOL, NULL, NULL },
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	978 { DT_LAST, 0, 0, 0, NULL, NULL },
906 e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	979 }
e591ce9b3526 Added support to gfxconv/view64 for unknown(?) bitmap format found on some Matti Hamalainen <ccr@tnsp.org> parents: 905 diff changeset	980 },
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	981
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	982 {
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	983 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE, "fp2", "FunPaint II (unpacked)", 0x3ff0, 33694,
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	984 C64_SCR_WIDTH, C64_SCR_HEIGHT,
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	985 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	986 fmtProbeFunPaint2Unpacked,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	987 fmtDecodeFunPaint2Unpacked, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	988 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	989 fmtGetPixelFunPaint2,
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	990 {
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	991 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400)
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	992 { DT_BITMAP, 0x2000, 0, 0, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	993 { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	994 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL },
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	995 DEF_SCREEN_RAMS_8( 0x43e8, 8, 0x400)
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	996 { DT_BITMAP, 0x63e8, 1, 0, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	997 { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	998 { DT_LAST, 0, 0, 0, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	999 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1000 },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1001
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1002 {
1396 7acadc08bc72 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1394 diff changeset	1003 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE, "fp2p", "FunPaint II (packed)", 0x3ff0, 0,
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1004 C64_SCR_WIDTH, C64_SCR_HEIGHT,
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1005 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1006 fmtProbeFunPaint2Packed,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1007 fmtDecodeFunPaint2Packed, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1008 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1009 fmtGetPixelFunPaint2,
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1010 {
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	1011 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400)
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1012 { DT_BITMAP, 0x2000, 0, 0, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1013 { DT_EXTRA_DATA, 0x3f40, 0, 100, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1014 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL },
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	1015 DEF_SCREEN_RAMS_8( 0x43e8, 8, 0x400)
1384 ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1016 { DT_BITMAP, 0x63e8, 1, 0, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1017 { DT_EXTRA_DATA, 0x8328, 1, 100, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1018 { DT_LAST, 0, 0, 0, NULL, NULL },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1019 }
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1020 },
ef20200d71d7 Implement (buggy) support for packed and unpacked FunPaint II images in Matti Hamalainen <ccr@tnsp.org> parents: 1382 diff changeset	1021
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1022 {
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1023 D64_FMT_MC \| D64_FMT_FLI \| D64_FMT_ILACE, "gun", "GunPaint (unpacked)", 0x4000, 0,
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1024 C64_SCR_WIDTH, C64_SCR_HEIGHT,
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1025 C64_SCR_CH_WIDTH , C64_SCR_CH_HEIGHT,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1026 fmtProbeGunPaint,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1027 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1028 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1029 fmtGetPixelGunPaint,
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1030 {
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	1031 DEF_SCREEN_RAMS_8( 0x0000, 0, 0x400)
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1032 { DT_BITMAP, 0x2000, 0, 0, NULL, NULL },
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1033 { DT_EXTRA_DATA, 0x3f4f, 0, 177, NULL, NULL },
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1034 { DT_COLOR_RAM, 0x4000, 0, 0, NULL, NULL },
1393 b5fc5a05033d Make screen ram definition macros more flexible, for possible future use cases. Matti Hamalainen <ccr@tnsp.org> parents: 1392 diff changeset	1035 DEF_SCREEN_RAMS_8( 0x4400, 8, 0x400)
1389 979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1036 { DT_BITMAP, 0x6400, 1, 0, NULL, NULL },
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1037 { DT_EXTRA_DATA, 0x47e8, 1, 20, NULL, NULL },
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1038 { DT_LAST, 0, 0, 0, NULL, NULL },
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1039 }
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1040 },
979f550ead77 Implement GunPaint support. Possibly not working correctly. Matti Hamalainen <ccr@tnsp.org> parents: 1388 diff changeset	1041
1394 054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1042 {
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1043 D64_FMT_HIRES \| D64_FMT_FLI, "chi", "Crest Hires FLI Designer (unpacked)", 0x4000, 16386,
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1044 C64_SCR_WIDTH, 14 * 8,
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1045 C64_SCR_CH_WIDTH , 14,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1046 NULL,
1394 054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1047 NULL, NULL,
1442 3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1048 NULL, NULL,
3773281491c9 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1433 diff changeset	1049 fmtGetPixelCHFLI,
1394 054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1050 {
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1051 { DT_BITMAP, 0x0000, 0, 0, NULL, NULL },
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1052 DEF_SCREEN_RAMS_8( 0x2000, 0, 0x400)
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1053 { DT_LAST, 0, 0, 0, NULL, NULL },
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1054 }
054561dbcd57 Add support for Crest Hires FLI Designer format. Matti Hamalainen <ccr@tnsp.org> parents: 1393 diff changeset	1055 },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1056 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1057
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1058 const int ndmC64ImageFormats = sizeof(dmC64ImageFormats) / sizeof(dmC64ImageFormats[0]);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1059
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1060
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	1061 // Perform probing of the given data buffer, trying to determine
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	1062 // if it contains a supported "C64" image format. Returns the
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	1063 // "probe score", see libgfx.h for list of values. If a match
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	1064 // is found, pointer to format description is set to *pfmt.
537 32d9e67da189 Rename generic probing function to match the style of other lib64gfx functions. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1065 int dmC64ProbeBMP(const Uint8 buf, const size_t len, const DMC64ImageFormat *pfmt)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1066 {
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	1067 int scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1068
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	1069 for (int i = 0; i < ndmC64ImageFormats; i++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1070 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	1071 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1072 int score = DM_PROBE_SCORE_FALSE;
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1073 if (fmt->probe == NULL && fmt->size > 0 && fmt->addr > 0)
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1074 {
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1075 // Generic probe just checks matching size and load address
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1076 if (len == fmt->size && dmCompareAddr16(buf, 0, fmt->addr))
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1077 score = DM_PROBE_SCORE_GOOD;
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1078 }
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1079 else
1134 d0898867ec4c Various fixes for issues reported by clang static analyzer. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1080 if (fmt->probe != NULL)
511 4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1081 score = fmt->probe(buf, len, fmt);
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	1082
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1083 if (score > scoreMax)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1084 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1085 scoreMax = score;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1086 scoreIndex = i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1087 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1088 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1089
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1090 if (scoreIndex >= 0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1092 *pfmt = &dmC64ImageFormats[scoreIndex];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1093 return scoreMax;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1094 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1095 else
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1096 return DM_PROBE_SCORE_FALSE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1097 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1098
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1099
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1100 static int dmC64SanityCheckEncDecOp(const int i, const DMC64EncDecOp op, const DMC64Image img)
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1101 {
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1102 switch (op->type)
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1103 {
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1104 case DT_COLOR_RAM:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1105 case DT_BITMAP:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1106 case DT_SCREEN_RAM:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1107 case DT_CHAR_DATA:
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1108 if (op->bank < 0 \|\| op->bank > img->nbanks)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1109 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1110 return dmError(DMERR_INTERNAL,
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1111 "Invalid bank %d / %d definition in generic encode/decode operator %d @ #%d.\n",
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1112 op->bank, img->nbanks, op->type, i);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1113 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1114 break;
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1115
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1116 case DT_EXTRA_DATA:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1117 if (op->bank < 0 \|\| op->bank >= C64_MAX_EXTRA_DATA)
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1118 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1119 return dmError(DMERR_INTERNAL,
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1120 "Invalid bank %d definition in generic encode/decode operator %d @ #%d.\n",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1121 op->bank, op->type, i);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1122 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1123 break;
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1124 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1125
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1126 if (op->type < 0 \|\| op->type >= DT_LAST)
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1127 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1128 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1129 "Invalid encode/decode operator type %d @ #%d.\n",
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1130 op->type, i);
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1131 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1132
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1133 return DMERR_OK;
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1134 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1135
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1136
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1137 static BOOL dmC64GetOpSize(const DMC64EncDecOp op, const DMC64ImageFormat fmt, size_t *size)
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1138 {
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1139 BOOL check;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1140 switch (op->type)
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1141 {
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1142 case DT_SCREEN_RAM:
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1143 case DT_COLOR_RAM:
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1144 size = fmt->ch_height fmt->ch_width;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1145 check = TRUE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1146 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1147
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1148 case DT_BITMAP:
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1149 size = fmt->ch_height fmt->ch_width * 8;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1150 check = TRUE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1151 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1152
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1153 case DT_EXTRA_DATA:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1154 *size = op->size;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1155 check = TRUE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1156 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1157
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1158 case DT_CHAR_DATA:
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1159 size = C64_MAX_CHARS C64_CHR_SIZE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1160 check = TRUE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1161 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1162
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1163 case DT_COLOR_REG:
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1164 *size = 1;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1165 check = FALSE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1166 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1167
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1168 default:
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1169 *size = 0;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1170 check = FALSE;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1171 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1172
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1173 if (op->size != 0)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1174 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1175 if (check && op->size > *size)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1176 return FALSE;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1177
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1178 *size = op->size;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1179 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1180
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1181 return TRUE;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1182 }
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1183
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	1184
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1185 int dmC64DecodeGenericBMP(DMC64Image img, const Uint8 buf,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1186 const size_t len, const DMC64ImageFormat *fmt)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1187 {
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1188 int res = DMERR_OK;
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1189
513 486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1190 if (buf == NULL \|\| img == NULL \|\| fmt == NULL)
486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1191 return DMERR_NULLPTR;
486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	1192
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	1193 // Clear the image structure, set basics
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1194 img->type = fmt->type;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1195 img->width = fmt->width;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1196 img->height = fmt->height;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1197 img->ch_width = fmt->ch_width;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1198 img->ch_height = fmt->ch_height;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1199 img->nbanks = dmC64ImageGetNumBanks(fmt);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1200
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	1201 // Perform decoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1202 for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1203 {
515 a896c1153e4e s/decenc/encdec/g Matti Hamalainen <ccr@tnsp.org> parents: 514 diff changeset	1204 const DMC64EncDecOp *op = &fmt->encdecOps[i];
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1205 const Uint8 *src;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1206 size_t size;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1207
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1208 // Check for last operator
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1209 if (op->type == DT_LAST)
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1210 break;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1212 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1213 if ((res = dmC64SanityCheckEncDecOp(i, op, img)) != DMERR_OK)
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1214 return res;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	1215
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1216 // Check size
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1217 if (!dmC64GetOpSize(op, fmt, &size))
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1218 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1219 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1220 "Decode op SIZE out of bounds, op #%d type=%d, offs=%d ($%04x), "
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1221 "bank=%d, size=%d ($%04x) vs. allocated %d ($%04x)\n",
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1222 i, op->type, op->offs, op->offs, op->bank, size, size, op->size, op->size);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1223 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1224
aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1225 // Do we need to reallocate some more space?
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1226 if (op->offs + size > len)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1227 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1228 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1229 "Decode out of bounds, op #%d type=%d, offs=%d ($%04x), "
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1230 "bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1231 i, op->type, op->offs, op->offs, op->bank, size, size, len, len);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1232 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1233
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234 src = buf + op->offs;
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1235
aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1236 // Perform operation
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237 switch (op->type)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1238 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 case DT_COLOR_RAM: memcpy(img->color[op->bank], src, size); break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240 case DT_BITMAP: memcpy(img->bitmap[op->bank], src, size); break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1241 case DT_SCREEN_RAM: memcpy(img->screen[op->bank], src, size); break;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1242 case DT_CHAR_DATA: memcpy(img->charmem[op->bank], src, size); break;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1243 case DT_EXTRA_DATA:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1244 if (img->extraData[op->bank] != NULL)
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1245 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1246 return dmError(DMERR_INTERNAL,
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1247 "Extra data block already allocated and used! "
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1248 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1249 i, op->offs, op->offs, op->bank, size, size, len, len);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1250 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1251 if ((img->extraData[op->bank] = dmMalloc0(size)) == NULL)
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1252 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1253 return dmError(DMERR_MALLOC,
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1254 "Could not allocate extradata block! "
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1255 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1256 i, op->offs, op->offs, op->bank, size, size, len, len);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1257 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1258 img->extraDataSizes[op->bank] = size;
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1259 memcpy(img->extraData[op->bank], src, size);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1260 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1261
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1262 case DT_COLOR_REG:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1263 switch (op->size)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1264 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1265 case DC_D020: img->d020 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1266 case DC_BGCOL:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1267 case DC_D021: img->bgcolor = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1268 case DC_D022: img->d022 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1269 case DC_D023: img->d023 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1270 case DC_D024: img->d024 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1271 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1272 return dmError(DMERR_INTERNAL,
1371 e6b13426b50a Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1370 diff changeset	1273 "Unhandled DT_COLOR_REG mode %d in "
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1274 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1275 op->size, i, op->offs, op->offs, op->bank, size, size, len, len);
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1276 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1277 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1278
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1279 case DT_COLOR_SET:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1280 switch (op->size)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1281 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1282 case DC_D020: img->d020 = op->offs; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1283 case DC_BGCOL:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1284 case DC_D021: img->bgcolor = op->offs; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1285 case DC_D022: img->d022 = op->offs; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1286 case DC_D023: img->d023 = op->offs; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1287 case DC_D024: img->d024 = op->offs; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1288 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1289 return dmError(DMERR_INTERNAL,
1371 e6b13426b50a Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1370 diff changeset	1290 "Unhandled DT_COLOR_SET mode %d in "
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1291 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1292 op->size, i, op->offs, op->offs, op->bank, size, size, len, len);
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1293 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1294 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1295
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1296 case DT_CHAR_CONFIG:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1297 switch (op->offs)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1298 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1299 case D64_CHCFG_SCREEN:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1300 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1301
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1302 case D64_CHCFG_LINEAR:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1303 {
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1304 for (int bank = 0; bank < img->nbanks; bank++)
1371 e6b13426b50a Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1370 diff changeset	1305 for (int offs = 0; offs < fmt->ch_height * fmt->ch_width; offs++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1306 img->screen[bank][offs] = offs & 0xff;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1307 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1308 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1309
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1310 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1311 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1312 "Unhandled DT_CHAR_CONFIG mode %d in ",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1313 "op #%d, bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1314 op->offs, i, op->bank, size, size, len, len);
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1315 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1316 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1317
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1318 case DT_DEC_FUNCTION:
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1319 if (op->decfunction == NULL)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1320 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1321 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1322 "Decode op is a function, but function ptr is NULL: "
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1323 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1324 i, op->offs, op->offs, op->bank, size, size, len, len);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 }
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1326 if (!op->decfunction(img, op, buf, len))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1327 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1328 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1329 "Decode op custom function failed: op #%d, "
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	1330 "offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1331 i, op->offs, op->offs, op->bank, size, size, len, len);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1332 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1333 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1334 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1335 }
916 3985f596ece5 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 915 diff changeset	1336
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	1337 return DMERR_OK;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1340
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1341 int dmC64EncodeGenericBMP(Uint8 *pbuf, size_t plen, const DMC64Image img, const DMC64ImageFormat fmt)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1342 {
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1343 int res = DMERR_OK;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1344 Uint8 *buf;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1345 size_t allocated;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1346
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1347 if (pbuf == NULL \|\| plen == NULL \|\| img == NULL \|\| fmt == NULL)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1348 return DMERR_NULLPTR;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1349
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1350 // Allocate the output buffer
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1351 *plen = 0;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1352 if (fmt->size > 0)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1353 *plen = allocated = fmt->size;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1354 else
935 77c07853797b Allocate somewhat larger initial encoding buffer for C64 image encoders. Matti Hamalainen <ccr@tnsp.org> parents: 934 diff changeset	1355 allocated = 16 * 1024;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1356
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1357 if ((buf = dmMalloc(allocated)) == NULL)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1358 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1359 return dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1360 "Could not allocate %d bytes of memory for C64 image encoding buffer.\n",
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1361 allocated);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1362 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1363 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1364
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1365 // Perform encoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1366 for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1367 {
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1368 const DMC64EncDecOp *op = &fmt->encdecOps[i];
1448 50402c225ef4 Do not insert load address to the buffer beginning in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1447 diff changeset	1369 Uint8 *dst = buf + op->offs;
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	1370 size_t size, chksize;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1371
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1372 // Check for last operator
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1373 if (op->type == DT_LAST)
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1374 break;
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1375
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1376 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1377 if ((res = dmC64SanityCheckEncDecOp(i, op, img)) != DMERR_OK)
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1378 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1379
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1380 // Check size
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1381 if (!dmC64GetOpSize(op, fmt, &size))
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1382 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1383 res = dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1384 "Decode op SIZE out of bounds, op #%d type=%d, offs=%d ($%04x), "
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1385 "bank=%d, size=%d ($%04x) vs. allocated %d ($%04x)\n",
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1386 i, op->type, op->offs, op->offs, op->bank, size, size, op->size, op->size);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1387 goto err;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1388 }
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1389
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1390 // Do we need to reallocate some more space?
1448 50402c225ef4 Do not insert load address to the buffer beginning in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1447 diff changeset	1391 chksize = op->offs + size;
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	1392 if (chksize > allocated)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1393 {
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	1394 size_t diff = allocated - chksize,
833 4f3828914890 Fix a 100L :S Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1395 grow = (diff / (BUF_SIZE_GROW - 1)) * BUF_SIZE_GROW;
934 fa15335238cf Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 932 diff changeset	1396
833 4f3828914890 Fix a 100L :S Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1397 allocated += grow;
4f3828914890 Fix a 100L :S Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1398
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1399 if ((buf = dmRealloc(buf, allocated)) == NULL)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1400 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1401 res = dmError(DMERR_MALLOC,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1402 "Could not re-allocate %d bytes of memory for C64 image encoding buffer.\n",
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1403 allocated);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1404 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1405 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1406 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1407
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	1408 if (fmt->size == 0 && chksize > *plen)
0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	1409 *plen = chksize;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1410
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1411 // Perform operation
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1412 switch (op->type)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1413 {
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1414 case DT_COLOR_RAM: memcpy(dst, img->color[op->bank], size); break;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1415 case DT_BITMAP: memcpy(dst, img->bitmap[op->bank], size); break;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1416 case DT_SCREEN_RAM: memcpy(dst, img->screen[op->bank], size); break;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1417 case DT_CHAR_DATA: memcpy(dst, img->charmem[op->bank], size); break;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1418 case DT_EXTRA_DATA:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1419 if (img->extraData[op->bank] == NULL)
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1420 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1421 res = dmError(DMERR_NULLPTR,
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1422 "DT_EXTRA_DATA block is NULL in ",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1423 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1424 i, op->offs, op->offs, op->bank, size, size, plen, plen);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1425 goto err;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1426 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1427 if (size > img->extraDataSizes[op->bank])
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1428 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1429 res = dmError(DMERR_INTERNAL,
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1430 "DT_EXTRA_DATA size mismatch %d <> %d in ",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1431 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1432 op->size, img->extraDataSizes[op->bank], i, op->offs, op->offs, op->bank, size, size, plen, plen);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1433 goto err;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1434 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1435 memcpy(dst, img->extraData[op->bank], size);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1436 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1437
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1438 case DT_COLOR_REG:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1439 switch (op->size)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1440 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1441 case DC_D020: *dst = img->d020; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1442 case DC_BGCOL:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1443 case DC_D021: *dst = img->bgcolor; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1444 case DC_D022: *dst = img->d022; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1445 case DC_D023: *dst = img->d023; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1446 case DC_D024: *dst = img->d024; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1447 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1448 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1449 "Unhandled DT_COLOR_REG mode %d in ",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1450 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1451 op->size, i, op->offs, op->offs, op->bank, size, size, plen, plen);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1452 goto err;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1453 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1454 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1455
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1456 case DT_ENC_FUNCTION:
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1457 if (op->encfunction == NULL)
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1458 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1459 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1460 "Encode op is a function, but function ptr is NULL: "
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1461 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1462 i, op->offs, op->offs, op->bank, size, size, plen, plen);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1463 goto err;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1464 }
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1465 /*
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1466 if (!op->encfunction(op, buf, len))
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1467 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1468 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1469 "Encode op custom function failed: op #%d, "
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1470 "offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1471 i, op->offs, op->offs, op->bank, size, size, len, len);
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1472 goto out;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1473 }
d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1474 */
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1475 break;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1476 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1477 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1478
1448 50402c225ef4 Do not insert load address to the buffer beginning in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1447 diff changeset	1479 res = DMERR_OK;
535 ab8d9696225c Add helper macros and use them to set the loading address while encoding. Matti Hamalainen <ccr@tnsp.org> parents: 534 diff changeset	1480
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1481 err:
535 ab8d9696225c Add helper macros and use them to set the loading address while encoding. Matti Hamalainen <ccr@tnsp.org> parents: 534 diff changeset	1482 *pbuf = buf;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1483 return res;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1484 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1485
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1486
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1487 // Convert a generic "C64" format bitmap in DMC64Image struct to
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1488 // a indexed/paletted bitmap image.
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1489 int dmC64ConvertGenericBMP2Image(DMImage dst, const DMC64Image src, const DMC64ImageFormat *fmt)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1490 {
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1491 DMC64GetPixelFunc getPixel;
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1492
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1493 // Sanity check arguments
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1494 if (dst == NULL \|\| src == NULL)
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1495 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1496
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1497 if (dst->width < src->width \|\| dst->height < src->height)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1498 {
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1499 return dmError(DMERR_INVALID_DATA,
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1500 "Invalid src vs. dst width/height %d x %d <-> %d x %d\n",
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1501 src->width, src->height, dst->width, dst->height);
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1502 }
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1503
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	1504 dmMemset(dst->data, 0, dst->size);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1505
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1506 // Check pixel getter function
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1507 if (fmt->getPixel != NULL)
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1508 getPixel = fmt->getPixel;
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1509 else
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1510 getPixel = (fmt->type & D64_FMT_MC) ? fmtGetGenericMCPixel : fmtGetGenericSCPixel;
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1511
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1512 // Resolution interlaced pics need to halve the source width
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1513 int rwidth = src->width;
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1514 if ((src->type & D64_FMT_ILACE) && src->laceType == D64_ILACE_RES)
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1515 rwidth /= 2;
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1516
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1517 // Perform conversion
1411 a9afb2ad39cb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1396 diff changeset	1518 Uint8 *dp = dst->data;
a9afb2ad39cb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1396 diff changeset	1519 for (int yc = 0; yc < src->height; yc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1520 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1521 Uint8 *d = dp;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1522 const int y = yc / 8, yb = yc & 7;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1523 const int scroffsy = y * src->ch_width;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1524 int xc;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1525
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1526 if (src->type & D64_FMT_CHAR)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1527 {
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1528 // Charmode conversion
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1529 if ((src->type & D64_FMT_MC) == D64_FMT_HIRES)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1530 // Hi-res charmap
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1531 for (xc = 0; xc < rwidth; xc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1532 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1533 const int x = xc / 8;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1534 const int scroffs = scroffsy + x;
918 59615f9c2ca9 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 917 diff changeset	1535 const int chr = src->screen[0][scroffs];
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1536 const int v = 7 - (xc & 7);
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1537
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1538 if ((src->charmem[0][chr * C64_CHR_SIZE + yb] >> v) & 1)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1539 *d++ = src->color[0][scroffs];
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1540 else
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1541 *d++ = src->bgcolor;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1542 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1543 else
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1544 // Multicolor variants
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1545 for (xc = 0; xc < rwidth; xc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1546 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1547 const int x = xc / 4;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1548 const int scroffs = scroffsy + x;
918 59615f9c2ca9 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 917 diff changeset	1549 const int chr = src->screen[0][scroffs];
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1550 const int col = src->color[0][scroffs] & 15;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	1551
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1552 if (col & 8)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1553 {
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1554 const int v = 6 - ((xc * 2) & 6);
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1555 switch ((src->charmem[0][chr * C64_CHR_SIZE + yb] >> v) & 3)
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1556 {
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1557 case 0: *d++ = src->bgcolor; break;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1558 case 1: *d++ = src->d022; break;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1559 case 2: *d++ = src->d023; break;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1560 case 3: *d++ = col;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1561 }
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1562 }
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1563 else
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1564 {
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1565 const int v = 7 - (xc & 7);
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1566 if ((src->charmem[0][chr * C64_CHR_SIZE + yb] >> v) & 1)
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1567 *d++ = src->color[0][scroffs];
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1568 else
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1569 *d++ = src->bgcolor;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1570 }
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1571 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1572 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1573 else
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1574 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1575 // Perform generic BITMAP conversion
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1576 const int bmoffsy = y * src->ch_width * 8 + yb;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1577
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1578 if ((src->type & D64_FMT_MC) == D64_FMT_HIRES)
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1579 // Hi-res bitmap
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1580 for (xc = 0; xc < rwidth; xc++)
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1581 {
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1582 const int x = xc / 8;
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1583 const int scroffs = scroffsy + x;
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1584 const int bmoffs = bmoffsy + (x * 8);
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1585 const int vshift = 7 - (xc & 7);
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1586
1387 14d79e4d82cf Oops, 100L. Had forgotten to change singlecolor mode handling pixel getter Matti Hamalainen <ccr@tnsp.org> parents: 1385 diff changeset	1587 *d++ = getPixel(src, bmoffs, scroffs, vshift, 0, yc);
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1588 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1589 else
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1590 // Multicolor bitmap and variants
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1591 for (xc = 0; xc < rwidth; xc++)
529 1bce06b5026f Combine conversion of interlaced and normal multicolor images to one function. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	1592 {
901 f532262f90b1 Actually fix commit 16aa5955dfb5. Matti Hamalainen <ccr@tnsp.org> parents: 857 diff changeset	1593 const int x = xc / 4;
f532262f90b1 Actually fix commit 16aa5955dfb5. Matti Hamalainen <ccr@tnsp.org> parents: 857 diff changeset	1594 const int scroffs = scroffsy + x;
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1595 const int bmoffs = bmoffsy + (x * 8);
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1596 const int vshift = 6 - ((xc * 2) & 6);
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1597
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1598 if (src->type & D64_FMT_ILACE)
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1599 {
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1600 switch (src->laceType)
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1601 {
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1602 case D64_ILACE_RES:
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1603 *d++ = getPixel(src, bmoffs, scroffs, vshift, 0, yc);
67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1604 *d++ = getPixel(src, bmoffs, scroffs, vshift, 1, yc);
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1605 break;
1366 d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1606
d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1607 default:
d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1608 return DMERR_NOT_SUPPORTED;
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1609 }
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1610 }
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1611 else
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1612 {
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1613 *d++ = getPixel(src, bmoffs, scroffs, vshift, 0, yc);
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1614 }
529 1bce06b5026f Combine conversion of interlaced and normal multicolor images to one function. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	1615 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1616 }
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1617 dp += dst->pitch;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1618 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1619
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	1620 return DMERR_OK;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1621 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1622
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1623
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1624 int dmC64ConvertBMP2Image(DMImage *pdst, const DMC64Image src, const DMC64ImageFormat *fmt)
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1625 {
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1626 int res;
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1627 DMImage *dst;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1628
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1629 if (pdst == NULL \|\| src == NULL)
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1630 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1631
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1632 // Allocate image structure
1289 4b025a96ad46 Fix. Matti Hamalainen <ccr@tnsp.org> parents: 1235 diff changeset	1633 if ((*pdst = dst = dmImageAlloc(src->width, src->height, DM_IFMT_PALETTE, -1)) == NULL)
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1634 return DMERR_MALLOC;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1635
1426 4c7b456d7f0b Rename global dmC64Palette to dmDefaultC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 1425 diff changeset	1636 // Set partial palette information
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1637 dst->ncolors = C64_NCOLORS;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1638 dst->constpal = TRUE;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1639
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1640 // Convert
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1641 if (fmt->convertFrom != NULL)
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1642 res = fmt->convertFrom(dst, src, fmt);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1643 else
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1644 res = dmC64ConvertGenericBMP2Image(dst, src, fmt);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1645
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1646 return res;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1647 }
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1648
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1649
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1650 int dmC64DecodeBMP(DMC64Image *img, const Uint8 buf, const size_t len,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1651 const size_t probeOffs, const size_t loadOffs,
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	1652 const DMC64ImageFormat *fmt, const DMC64ImageFormat forced)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1653 {
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1654 if (img == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1655 return DMERR_NULLPTR;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1656
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1657 // Check for forced format
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1658 if (forced != NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1659 *fmt = forced;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1660 else
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1661 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1662 // Nope, perform a generic probe
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1663 if (probeOffs >= len)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1664 return DMERR_OUT_OF_DATA;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1665
537 32d9e67da189 Rename generic probing function to match the style of other lib64gfx functions. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1666 if (dmC64ProbeBMP(buf + probeOffs, len - probeOffs, fmt) == DM_PROBE_SCORE_FALSE)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1667 return DMERR_NOT_SUPPORTED;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1668 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1669
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1670 if (loadOffs >= len)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1671 return DMERR_INVALID_ARGS;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1672
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1673 if (*fmt == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1674 return DMERR_INVALID_DATA;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1675
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1676 // Allocate memory
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1677 if ((img = dmC64ImageAlloc(fmt)) == NULL)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1678 return DMERR_MALLOC;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1679
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1680 // Decode the bitmap to memory layout
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1681 if ((*fmt)->decode != NULL)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1682 return (fmt)->decode(img, buf + loadOffs, len - loadOffs, *fmt);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1683 else
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1684 return dmC64DecodeGenericBMP(img, buf + loadOffs, len - loadOffs, fmt);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1685 }

Mercurial > hg > dmlib

annotate tools/lib64gfx.c @ 1463:bde6a66bc2f6