dmlib: tools/lib64gfx.c annotate

annotate tools/lib64gfx.c @ 1647:948d6fda722d

Add sanity check for interlaced formats: check that the interlace type flags are set.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 30 May 2018 01:17:57 +0300
parents	262300a0359b
children	9233da9de92c

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
1644 9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	15 char * dmC64GetImageTypeString(char *buf, const size_t len, const int type, const BOOL lng)
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	16 {
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	17 snprintf(buf, len,
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	18 "%s%s%s%s",
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	19 (type & D64_FMT_MC) ? (lng ? "MultiColor " : "MC ") : "HiRes ",
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	20 (type & D64_FMT_ILACE) ? (lng ? "Interlaced " : "ILace ") : "",
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	21 (type & D64_FMT_FLI) ? "FLI " : "",
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	22 (type & D64_FMT_CHAR) ? "CHAR" : ""
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	23 );
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	24
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	25 return buf;
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	26 }
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	27
9d9a0e852b3d Reorder some functions. Matti Hamalainen <ccr@tnsp.org> parents: 1632 diff changeset	28
1488 c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	29 void dmC64ImageDump(FILE fh, const DMC64Image img, const DMC64ImageFormat *fmt)
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	30 {
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	31 char typeStr[64];
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	32
1494 3b220604ae3c Add short format attribute names to dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 1492 diff changeset	33 dmC64GetImageTypeString(typeStr, sizeof(typeStr), img->type, TRUE);
1488 c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	34
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	35 if (fmt != NULL)
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	36 {
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	37 fprintf(fh,
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	38 "Format : %s [%s]\n",
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	39 fmt->name, fmt->fext);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	40 }
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	41
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	42 fprintf(fh,
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	43 "Type : %s\n"
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	44 "Banks : %d\n",
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	45 typeStr,
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	46 img->nbanks);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	47
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	48 if (img->type & D64_FMT_ILACE)
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	49 {
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	50 char *tmps;
1647 948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	51 switch (img->laceType)
1488 c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	52 {
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	53 case D64_ILACE_COLOR: tmps = "color"; break;
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	54 case D64_ILACE_RES: tmps = "resolution"; break;
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	55 default: tmps = "ERROR"; break;
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	56 }
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	57 fprintf(fh,
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	58 "Interlace type : %s\n",
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	59 tmps);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	60 }
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	61
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	62 fprintf(fh,
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	63 "Width x Height : %d x %d\n"
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	64 "CHwidth x CHheight : %d x %d\n",
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	65 img->width, img->height,
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	66 img->chWidth, img->chHeight);
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	67 }
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	68
c71b6c5204af Factor the C64 bitmap image format info dump function to lib64gfx and use it from 64vw. Matti Hamalainen <ccr@tnsp.org> parents: 1487 diff changeset	69
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	70 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	71 {
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	72 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	73 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	74 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	75 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	76 }
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	77
dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1456 diff changeset	78
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	79 BOOL dmCompareAddr16(const Uint8 *buf, const size_t offs, const Uint16 addr)
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	80 {
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	81 return buf[offs ] == DM_GET_ADDR_LO(addr) &&
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	82 buf[offs + 1] == DM_GET_ADDR_HI(addr);
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	83 }
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	84
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	85
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	86 int dmC64ImageGetNumBanks(const DMC64ImageFormat *fmt)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	87 {
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	88 int nbanks = 0;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	89 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	90 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	91 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	92 if (op->type == DT_LAST)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	93 break;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	94
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	95 if (op->bank > nbanks)
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	96 nbanks = op->bank;
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
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	99 return nbanks + 1;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	100 }
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	101
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	102
1645 262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	103 BOOL dmReverseGetByte(const Uint8 buf, size_t offs, Uint8 *data)
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	104 {
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	105 if (*offs > 0)
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	106 {
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	107 data = buf[--(offs)];
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	108 return TRUE;
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	109 }
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	110 else
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	111 return FALSE;
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	112 }
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	113
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	114
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	115 BOOL dmReversePutByte(Uint8 buf, size_t offs, const Uint8 data)
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	116 {
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	117 if (*offs > 0)
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	118 {
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	119 buf[--(*offs)] = data;
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	120 return TRUE;
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	121 }
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	122 else
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	123 return FALSE;
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	124 }
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	125
262300a0359b Add helper functions dmReverse{Get,Put}Byte(). Matti Hamalainen <ccr@tnsp.org> parents: 1644 diff changeset	126
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	127 int dmC64MemBlockAlloc(DMC64MemBlock *blk, const size_t size)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	128 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	129 if ((blk->data = dmMalloc0(size)) == NULL)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	130 return DMERR_MALLOC;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	131
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	132 blk->size = size;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	133 return DMERR_OK;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	134 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	135
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	136
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	137 int dmC64MemBlockCopy(DMC64MemBlock dst, const DMC64MemBlock src)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	138 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	139 if (src->data != NULL && src->size > 0)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	140 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	141 dst->size = src->size;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	142 if ((dst->data = dmMalloc(src->size)) == NULL)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	143 return DMERR_MALLOC;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	144
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	145 memcpy(dst->data, src->data, src->size);
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	146 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	147
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	148 return DMERR_OK;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	149 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	150
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	151
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	152 void dmC64MemBlockFree(DMC64MemBlock *blk)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	153 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	154 if (blk != NULL)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	155 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	156 dmFreeR(&blk->data);
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	157 blk->size = 0;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	158 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	159 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	160
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	161
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	162 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	163 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	164 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	165
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	166 if (img == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	167 return NULL;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	168
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	169 // Initialize image information
1492 5f9080d24f3c Set DMC64Image::type in dmC64ImageAlloc() from format type. Matti Hamalainen <ccr@tnsp.org> parents: 1491 diff changeset	170 img->type = fmt->type;
1491 b329fea6f013 Reindent polishing. Matti Hamalainen <ccr@tnsp.org> parents: 1489 diff changeset	171 img->width = fmt->width;
b329fea6f013 Reindent polishing. Matti Hamalainen <ccr@tnsp.org> parents: 1489 diff changeset	172 img->height = fmt->height;
b329fea6f013 Reindent polishing. Matti Hamalainen <ccr@tnsp.org> parents: 1489 diff changeset	173 img->chWidth = fmt->chWidth;
b329fea6f013 Reindent polishing. Matti Hamalainen <ccr@tnsp.org> parents: 1489 diff changeset	174 img->chHeight = fmt->chHeight;
b329fea6f013 Reindent polishing. Matti Hamalainen <ccr@tnsp.org> parents: 1489 diff changeset	175 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	176
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	177 // Allocate banks
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	178 if ((img->color = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL \|\|
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	179 (img->bitmap = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL \|\|
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	180 (img->screen = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL \|\|
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	181 (img->charData = dmCalloc(img->nbanks, sizeof(DMC64MemBlock))) == NULL)
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	182 goto err;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	183
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	184 return img;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	185
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	186 err:
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	187 dmC64ImageFree(img);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	188 return NULL;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	189 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	190
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	191
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	192 void dmC64ImageFree(DMC64Image *img)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	193 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	194 if (img != NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	195 {
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	196 // Free the allocated areas
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	197 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	198 {
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	199 dmC64MemBlockFree(&img->color[i]);
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	200 dmC64MemBlockFree(&img->bitmap[i]);
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	201 dmC64MemBlockFree(&img->screen[i]);
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	202 dmC64MemBlockFree(&img->charData[i]);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	203 }
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	204
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	205 // 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	206 dmFree(img->color);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	207 dmFree(img->bitmap);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	208 dmFree(img->screen);
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	209 dmFree(img->charData);
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	210
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	211 // Extra data ..
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	212 for (int i = 0; i < C64_MAX_EXTRA_DATA; i++)
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	213 dmC64MemBlockFree(&img->extraData[i]);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	214
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	215 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	216 dmFree(img);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	217 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	218 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	219
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	220
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	221 int dmC64ConvertCSDataToImage(DMImage *img,
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	222 int xoffs, int yoffs, const Uint8 *buf,
915 ba6b210c9bf4 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 912 diff changeset	223 int width, int height, BOOL multicolor,
ba6b210c9bf4 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 912 diff changeset	224 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	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 int yc, widthpx = width * 8;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	227 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	228
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 if (img == NULL)
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	230 return DMERR_NULLPTR;
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	231
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	232 if (xoffs < 0 \|\| yoffs < 0 \|\|
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	233 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	234 yoffs > img->height - height)
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	235 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	236
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 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	238
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 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	240 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 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	242 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243 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	244 int xc;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	245 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	246
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 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	248 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 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	250 const int v = 6 - ((xc * 2) & 6);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	251 const Uint8 c = colors[(b >> v) & 3];
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	252
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253 *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	254 *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	255 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 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	258 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 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	263 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 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	265 int xc;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	266 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	267
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 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	269 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 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	271 const int v = 7 - (xc & 7);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	272 const Uint8 c = colors[(b >> v) & 1];
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	273
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 *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	275 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 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	278 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 }
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	280
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	281 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	282 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	285 void dmGenericRLEAnalyze(const DMGrowBuf buf, Uint8 rleMarker, const int rleType)
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	286 {
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	287 #define DM_STAT_MAX 256
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	288 size_t *stats;
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	289
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	290 // Allocate statistics counts buffer
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	291 if ((stats = dmMalloc0(DM_STAT_MAX * sizeof(size_t))) == NULL)
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	292 return;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	293
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	294 // Get statistics on the data
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	295 for (size_t offs = 0; offs < buf->len; offs++)
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	296 stats[buf->data[offs]]++;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	297
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	298 // According to compression type ..
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	299 if (rleType == DM_COMP_RLE_MARKER1 \|\| rleType == DM_COMP_RLE_MARKER2)
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	300 {
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	301 size_t selected = 0,
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	302 smallest = buf->len;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	303
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	304 // Find least used byte value
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	305 for (size_t n = 0; n < DM_STAT_MAX; n++)
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	306 {
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	307 if (stats[n] < smallest)
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	308 {
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	309 selected = n;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	310 smallest = stats[n];
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	311 }
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	312 }
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	313
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	314 *rleMarker = selected;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	315 }
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	316 else
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	317 *rleMarker = 0xC0;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	318
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	319 dmFree(stats);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	320 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	321
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	322
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	323 int dmDecodeGenericRLE(DMGrowBuf dst, const Uint8 src, const Uint8 srcEnd, const DMCompParams cfg)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 {
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	325 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	326
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	327 // Perform RLE decode
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	328 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	329 {
1476 f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	330 Uint8 data = *src++;
f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	331 int count = 1;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	332
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	333 switch (cfg->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	334 {
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	335 case DM_COMP_RLE_MARKER1:
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	336 case DM_COMP_RLE_MARKER2:
1476 f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	337 // A simple marker byte RLE variant: [Marker] [count] [data]
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	338 if (data == cfg->rleMarker)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	339 {
1597 501e31f11c29 Fix RLE decoder bounds checks for compressed sequences. Matti Hamalainen <ccr@tnsp.org> parents: 1591 diff changeset	340 if (srcEnd - src + 1 < 2)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	341 {
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	342 res = DMERR_INVALID_DATA;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	343 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	344 }
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	345
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	346 switch (cfg->type)
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	347 {
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	348 case DM_COMP_RLE_MARKER1:
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	349 count = *src++;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	350 data = *src++;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	351 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	352
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	353 case DM_COMP_RLE_MARKER2:
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	354 data = *src++;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	355 count = *src++;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	356 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	357 }
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	358 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	359 break;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	360
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	361 case DM_COMP_RLE_MASK:
1476 f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	362 // Mask marker RLE: usually high bit(s) of byte mark RLE sequence
f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	363 // and the lower bits contain the count: [Mask + count] [data]
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	364 if ((data & cfg->rleMask1) == cfg->rleMarker)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	365 {
1597 501e31f11c29 Fix RLE decoder bounds checks for compressed sequences. Matti Hamalainen <ccr@tnsp.org> parents: 1591 diff changeset	366 if (srcEnd - src + 1 < 1)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	367 {
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	368 res = DMERR_INVALID_DATA;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	369 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	370 }
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	371
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	372 count = data & cfg->rleMask2;
1476 f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	373 data = *src++;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	374 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	375 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	376 }
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	377
1476 f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	378 while (count--)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	379 {
1476 f0232684857a Cleanup the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1475 diff changeset	380 if (!dmGrowBufPutU8(dst, data))
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	381 {
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	382 res = DMERR_MALLOC;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	383 goto err;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	384 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	385 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 }
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	387
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	388 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	389
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	390 err:
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	391 return res;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	392 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	393
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	394
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	395 int dmDecodeGenericRLEAlloc(DMGrowBuf dst, const Uint8 src, const Uint8 srcEnd, const DMCompParams cfg)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	396 {
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	397 int res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	398 if ((res = dmGrowBufAlloc(dst, BUF_SIZE_INITIAL, BUF_SIZE_GROW)) != DMERR_OK)
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	399 return res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	400
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	401 return dmDecodeGenericRLE(dst, src, srcEnd, cfg);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	402 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	403
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	404
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	405 static BOOL dmEncodeGenericRLESequence(DMGrowBuf dst, const Uint8 data, Uint8 count, const DMCompParams cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	406 {
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	407 BOOL copyOnly = FALSE;
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	408
3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	409 switch (cfg->type)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	410 {
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	411 case DM_COMP_RLE_MARKER1:
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	412 case DM_COMP_RLE_MARKER2:
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	413 if (count >= cfg->rleMinCount \|\| data == cfg->rleMarker)
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	414 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	415 // A simple marker byte RLE variant: [Marker] [count] [data]
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	416 if (!dmGrowBufPutU8(dst, cfg->rleMarker))
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	417 return FALSE;
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	418
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	419 switch (cfg->type)
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	420 {
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	421 case DM_COMP_RLE_MARKER1:
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	422 if (!dmGrowBufPutU8(dst, count) \|\|
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	423 !dmGrowBufPutU8(dst, data))
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	424 return FALSE;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	425 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	426
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	427 case DM_COMP_RLE_MARKER2:
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	428 if (!dmGrowBufPutU8(dst, data) \|\|
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	429 !dmGrowBufPutU8(dst, count))
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	430 return FALSE;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	431 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	432 }
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	433 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	434 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	435 copyOnly = TRUE;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	436 break;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	437
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	438 case DM_COMP_RLE_MASK:
3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	439 if (count >= cfg->rleMinCount \|\| (data & cfg->rleMarker) == cfg->rleMarker)
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	440 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	441 // Mask marker RLE: usually high bit(s) of byte mark RLE sequence
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	442 // and the lower bits contain the count: [Mask + count] [data]
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	443 if (!dmGrowBufPutU8(dst, cfg->rleMarker \| count) \|\|
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	444 !dmGrowBufPutU8(dst, data))
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	445 return FALSE;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	446 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	447 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	448 copyOnly = TRUE;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	449 break;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	450 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	451
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	452 if (copyOnly)
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	453 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	454 while (count--)
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	455 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	456 if (!dmGrowBufPutU8(dst, data))
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	457 return FALSE;
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	458 }
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	459 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	460
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	461 return TRUE;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	462 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	463
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	464
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	465 int dmEncodeGenericRLE(DMGrowBuf dst, const Uint8 src, const Uint8 srcEnd, const DMCompParams cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	466 {
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	467 // Perform RLE encoding
1512 ee691fbf8f27 Initialize previous data value in RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1511 diff changeset	468 int count = 0, prev = -1;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	469 while (src < srcEnd)
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	470 {
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	471 Uint8 data = *src++;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	472
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	473 if (data != prev \|\| count >= cfg->rleMaxCount)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	474 {
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	475 if (!dmEncodeGenericRLESequence(dst, prev, count, cfg))
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	476 goto err;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	477
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	478 count = 1;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	479 }
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	480 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	481 count++;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	482
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	483 prev = data;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	484 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	485
1518 24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	486 if (!dmEncodeGenericRLESequence(dst, prev, count, cfg))
24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	487 goto err;
24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	488
24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	489 return DMERR_OK;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	490
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	491 err:
1518 24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	492 return dmError(DMERR_MALLOC,
24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	493 "Could reallocate memory for RLE encoding buffer.\n");
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	494 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	495
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	496
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	497 int dmEncodeGenericRLEAlloc(DMGrowBuf dst, const Uint8 src, const Uint8 srcEnd, const DMCompParams cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	498 {
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	499 int res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	500 if ((res = dmGrowBufAlloc(dst, BUF_SIZE_INITIAL, BUF_SIZE_GROW)) != DMERR_OK)
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	501 return res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	502
1505 3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	503 return dmEncodeGenericRLE(dst, src, srcEnd, cfg);
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	504 }
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	505
519 feaaf0e2ecbe Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	506
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	507 // Perform probing of the given data buffer, trying to determine
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	508 // if it contains a supported "C64" image format. Returns the
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	509 // "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	510 // 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	511 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	512 {
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	513 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	514
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	515 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	516 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	517 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	518 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	519 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	520 {
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	521 // 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	522 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	523 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	524 }
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	525 else
1134 d0898867ec4c Various fixes for issues reported by clang static analyzer. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	526 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	527 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	528
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 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	530 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 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	532 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	533 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 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	537 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 *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	539 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	540 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 else
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	542 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	543 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545
1537 776aa43b2c57 Tiny improvement in MC->FLI upconversion. Matti Hamalainen <ccr@tnsp.org> parents: 1534 diff changeset	546 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	547 {
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	548 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	549 {
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	550 case DT_COLOR_RAM:
1586 3c9e5962eca6 Rename DT_BITMAP to DT_BITMAP_RAM. Matti Hamalainen <ccr@tnsp.org> parents: 1580 diff changeset	551 case DT_BITMAP_RAM:
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	552 case DT_SCREEN_RAM:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	553 case DT_CHAR_DATA:
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	554 if (op->bank < 0 \|\| op->bank > img->nbanks)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	555 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	556 return dmError(DMERR_INTERNAL,
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	557 "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	558 op->bank, img->nbanks, op->type, i);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	559 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	560 break;
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	561
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	562 case DT_EXTRA_DATA:
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	563 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	564 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	565 return dmError(DMERR_INTERNAL,
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	566 "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	567 op->bank, op->type, i);
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	568 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	569 break;
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	570 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	571
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	572 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	573 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	574 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	575 "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	576 op->type, i);
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	577 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	578
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	579 return DMERR_OK;
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	580 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	581
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	582
1537 776aa43b2c57 Tiny improvement in MC->FLI upconversion. Matti Hamalainen <ccr@tnsp.org> parents: 1534 diff changeset	583 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	584 {
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	585 switch (op->type)
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	586 {
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	587 case DT_SCREEN_RAM:
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	588 case DT_COLOR_RAM:
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	589 size = fmt->chHeight fmt->chWidth;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	590 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	591
1586 3c9e5962eca6 Rename DT_BITMAP to DT_BITMAP_RAM. Matti Hamalainen <ccr@tnsp.org> parents: 1580 diff changeset	592 case DT_BITMAP_RAM:
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	593 size = fmt->chHeight fmt->chWidth * 8;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	594 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	595
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	596 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	597 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	598 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	599
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	600 case DT_COLOR_REG:
1519 19b5013ff190 Fix c64 bitmap encoding / decoding bounds checks. Matti Hamalainen <ccr@tnsp.org> parents: 1518 diff changeset	601 *size = 1;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	602 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	603
1528 239dc13123fd Set size for DT_{DEC,ENC}_FUNCTION opcodes. Matti Hamalainen <ccr@tnsp.org> parents: 1521 diff changeset	604 case DT_DEC_FUNCTION:
239dc13123fd Set size for DT_{DEC,ENC}_FUNCTION opcodes. Matti Hamalainen <ccr@tnsp.org> parents: 1521 diff changeset	605 case DT_ENC_FUNCTION:
239dc13123fd Set size for DT_{DEC,ENC}_FUNCTION opcodes. Matti Hamalainen <ccr@tnsp.org> parents: 1521 diff changeset	606 case DT_EXTRA_DATA:
239dc13123fd Set size for DT_{DEC,ENC}_FUNCTION opcodes. Matti Hamalainen <ccr@tnsp.org> parents: 1521 diff changeset	607 *size = op->size;
239dc13123fd Set size for DT_{DEC,ENC}_FUNCTION opcodes. Matti Hamalainen <ccr@tnsp.org> parents: 1521 diff changeset	608 break;
239dc13123fd Set size for DT_{DEC,ENC}_FUNCTION opcodes. Matti Hamalainen <ccr@tnsp.org> parents: 1521 diff changeset	609
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	610 default:
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	611 *size = 0;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	612 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	613
1632 2a1866fd546e Use C64 encdec operator specified size for the element if it is larger than the default size. Matti Hamalainen <ccr@tnsp.org> parents: 1631 diff changeset	614 // If the operator specified size is larger, use it.
2a1866fd546e Use C64 encdec operator specified size for the element if it is larger than the default size. Matti Hamalainen <ccr@tnsp.org> parents: 1631 diff changeset	615 if (op->size > *size)
2a1866fd546e Use C64 encdec operator specified size for the element if it is larger than the default size. Matti Hamalainen <ccr@tnsp.org> parents: 1631 diff changeset	616 *size = op->size;
2a1866fd546e Use C64 encdec operator specified size for the element if it is larger than the default size. Matti Hamalainen <ccr@tnsp.org> parents: 1631 diff changeset	617
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	618 return TRUE;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	619 }
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	620
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	621
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	622 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	623 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	624 {
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	625 int res = DMERR_OK;
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	626
513 486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	627 if (buf == NULL \|\| img == NULL \|\| fmt == NULL)
486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	628 return DMERR_NULLPTR;
486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	629
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	630 // 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	631 img->type = fmt->type;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	632 img->width = fmt->width;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	633 img->height = fmt->height;
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	634 img->chWidth = fmt->chWidth;
df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	635 img->chHeight = fmt->chHeight;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	636 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	637
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	638 // Perform decoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	639 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	640 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	641 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	642 const Uint8 *src;
1600 e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	643 DMC64MemBlock *blk = NULL;
e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	644 char *blkname = 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	645 size_t size;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	646
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	647 // Check for last operator
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	648 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	649 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	650
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	651 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	652 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	653 return res;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	654
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	655 // Check size
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	656 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	657 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	658 return dmError(DMERR_INVALID_DATA,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	659 "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	660 "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	661 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	662 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	663
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	664 // Is the operation inside the bounds?
1519 19b5013ff190 Fix c64 bitmap encoding / decoding bounds checks. Matti Hamalainen <ccr@tnsp.org> parents: 1518 diff changeset	665 if (op->offs + size > len + 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	666 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	667 return dmError(DMERR_INVALID_DATA,
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	668 "Decode DATA 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	669 "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	670 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	671 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	672
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 src = buf + op->offs;
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	674
aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	675 // 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	676 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	677 {
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	678 case DT_COLOR_RAM:
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	679 case DT_SCREEN_RAM:
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	680 case DT_BITMAP_RAM:
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	681 case DT_CHAR_DATA:
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	682 case DT_EXTRA_DATA:
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	683 switch (op->type)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	684 {
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	685 case DT_COLOR_RAM : blk = &img->color[op->bank]; blkname = "Color RAM"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	686 case DT_SCREEN_RAM : blk = &img->screen[op->bank]; blkname = "Screen RAM"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	687 case DT_BITMAP_RAM : blk = &img->bitmap[op->bank]; blkname = "Bitmap RAM"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	688 case DT_CHAR_DATA : blk = &img->charData[op->bank]; blkname = "Character data"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	689 case DT_EXTRA_DATA : blk = &img->extraData[op->bank]; blkname = "Extra data"; break;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	690 }
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	691 if ((dmC64MemBlockAlloc(blk, size)) != DMERR_OK)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	692 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	693 return dmError(DMERR_MALLOC,
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	694 "Could not allocate '%s' block! "
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	695 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	696 blkname, i, op->offs, op->offs, op->bank, size, size, len, len);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	697 }
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	698 memcpy(blk->data, src, size);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	699 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	700
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	701 case DT_COLOR_REG:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	702 switch (op->size)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	703 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	704 case DC_D020: img->d020 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	705 case DC_BGCOL:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	706 case DC_D021: img->bgcolor = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	707 case DC_D022: img->d022 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	708 case DC_D023: img->d023 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	709 case DC_D024: img->d024 = *src; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	710 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	711 return dmError(DMERR_INTERNAL,
1371 e6b13426b50a Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1370 diff changeset	712 "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	713 "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	714 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	715 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	716 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	717
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	718 case DT_COLOR_SET:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	719 switch (op->size)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	720 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	721 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	722 case DC_BGCOL:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	723 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	724 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	725 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	726 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	727 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	728 return dmError(DMERR_INTERNAL,
1371 e6b13426b50a Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1370 diff changeset	729 "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	730 "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	731 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	732 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	733 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	734
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	735 case DT_CHAR_CONFIG:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	736 switch (op->offs)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	737 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	738 case D64_CHCFG_SCREEN:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	739 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	740
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	741 case D64_CHCFG_LINEAR:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	742 {
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	743 for (int bank = 0; bank < img->nbanks; bank++)
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	744 for (int offs = 0; offs < fmt->chHeight * fmt->chWidth; offs++)
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	745 img->screen[bank].data[offs] = offs & 0xff;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	746 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	747 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	748
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	749 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	750 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	751 "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	752 "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	753 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	754 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	755 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	756
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	757 case DT_DEC_FUNCTION:
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	758 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	759 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	760 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	761 "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	762 "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	763 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	764 }
1486 bc13af8954d7 Add DMC64ImageFormat to C64 bitmap format encoding/decoding ops function parameters. Matti Hamalainen <ccr@tnsp.org> parents: 1485 diff changeset	765 if (!op->decFunction(img, op, buf, len, 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	766 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	767 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	768 "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	769 "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	770 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	771 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 }
916 3985f596ece5 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 915 diff changeset	775
1647 948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	776 // Sanity check certain things ..
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	777 if ((fmt->type & D64_FMT_ILACE) && img->laceType == D64_ILACE_NONE)
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	778 {
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	779 return dmError(DMERR_INTERNAL,
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	780 "Format '%s' (%s) has interlace flag set, but interlace type is not set.\n",
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	781 fmt->name, fmt->fext);
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	782 }
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	783
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	784 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	785 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	788 int dmC64EncodeGenericBMP(const BOOL allocate, DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	789 {
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	790 int res = DMERR_OK;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	791
1469 0046b4e1b35f Various fixes in bmp encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1467 diff changeset	792 if (img == NULL \|\| fmt == NULL)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	793 return DMERR_NULLPTR;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	794
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	795 // Allocate the output buffer if requested
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	796 if (allocate && (res = dmGrowBufAlloc(buf, BUF_SIZE_INITIAL, BUF_SIZE_GROW)) != DMERR_OK)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	797 {
1472 b9d3577d8290 Improve error handling and checking. Matti Hamalainen <ccr@tnsp.org> parents: 1471 diff changeset	798 dmError(res,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	799 "Could not allocate %d bytes of memory for C64 image encoding buffer.\n",
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	800 fmt->size);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	801 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	802 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	803
1534 acad4974dc09 Use the DMGrowBuf push/pop functionality to better implement the stacked Matti Hamalainen <ccr@tnsp.org> parents: 1528 diff changeset	804 dmGrowBufPush(buf);
1506 4fd4e7a00db4 Fix handling of predefined DMGrowBuffer in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1505 diff changeset	805
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	806 // Perform encoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	807 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	808 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	809 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	810 size_t size, chksize;
1600 e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	811 const DMC64MemBlock *blk = NULL;
e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	812 char *blkname = NULL;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	813
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	814 // Check for last operator
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	815 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	816 break;
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	817
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	818 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	819 if ((res = dmC64SanityCheckEncDecOp(i, op, img)) != DMERR_OK)
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	820 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	821
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	822 // Check size
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	823 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	824 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	825 res = dmError(DMERR_INVALID_DATA,
1511 62ede0de6ab0 Fix an error message, should be "Encode", not "Decode". Matti Hamalainen <ccr@tnsp.org> parents: 1510 diff changeset	826 "Encode 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	827 "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	828 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	829 goto err;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	830 }
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	831
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	832 // Do we need to reallocate some more space?
1534 acad4974dc09 Use the DMGrowBuf push/pop functionality to better implement the stacked Matti Hamalainen <ccr@tnsp.org> parents: 1528 diff changeset	833 chksize = op->offs + size;
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	834 if (!dmGrowBufCheckGrow(buf, chksize))
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	835 {
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	836 res = dmError(DMERR_MALLOC,
88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	837 "Could not re-allocate %d bytes of memory for C64 image encoding buffer.\n",
88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	838 chksize);
88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	839 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	840 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	841
1487 06df2bdf5dc4 Various fixes to dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1486 diff changeset	842 if (chksize > buf->len)
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	843 buf->len = chksize;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	844
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	845 // Perform operation
1534 acad4974dc09 Use the DMGrowBuf push/pop functionality to better implement the stacked Matti Hamalainen <ccr@tnsp.org> parents: 1528 diff changeset	846 Uint8 *dst = buf->data + op->offs;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	847 switch (op->type)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	848 {
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	849 case DT_COLOR_RAM:
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	850 case DT_SCREEN_RAM:
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	851 case DT_BITMAP_RAM:
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	852 case DT_CHAR_DATA:
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	853 case DT_EXTRA_DATA:
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	854 switch (op->type)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	855 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	856 case DT_COLOR_RAM : blk = &img->color[op->bank]; blkname = "Color RAM"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	857 case DT_SCREEN_RAM : blk = &img->screen[op->bank]; blkname = "Screen RAM"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	858 case DT_BITMAP_RAM : blk = &img->bitmap[op->bank]; blkname = "Bitmap RAM"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	859 case DT_CHAR_DATA : blk = &img->charData[op->bank]; blkname = "Character data"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	860 case DT_EXTRA_DATA : blk = &img->extraData[op->bank]; blkname = "Extra data"; break;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	861 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	862 if (blk->data == NULL)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	863 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	864 res = dmError(DMERR_NULLPTR,
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	865 "'%s' block is NULL in "
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	866 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	867 blkname, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	868 goto err;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	869 }
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	870 if (size > blk->size)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	871 {
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	872 res = dmError(DMERR_INTERNAL,
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	873 "'%s' size mismatch %d <> %d in "
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	874 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	875 blkname, op->size, blk->size, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	876 goto err;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	877 }
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	878 memcpy(dst, blk->data, size);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	879 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	880
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	881 case DT_COLOR_REG:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	882 switch (op->size)
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	883 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	884 case DC_D020: *dst = img->d020; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	885 case DC_BGCOL:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	886 case DC_D021: *dst = img->bgcolor; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	887 case DC_D022: *dst = img->d022; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	888 case DC_D023: *dst = img->d023; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	889 case DC_D024: *dst = img->d024; break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	890 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	891 res = dmError(DMERR_INTERNAL,
1500 3223d01ac8e8 Fix some blunders in encode/decode error messages. Matti Hamalainen <ccr@tnsp.org> parents: 1499 diff changeset	892 "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	893 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	894 op->size, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	895 goto err;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	896 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	897 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	898
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	899 case DT_ENC_FUNCTION:
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	900 if (op->encFunction == NULL)
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	901 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	902 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	903 "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	904 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1463 diff changeset	905 i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	906 goto err;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	907 }
1486 bc13af8954d7 Add DMC64ImageFormat to C64 bitmap format encoding/decoding ops function parameters. Matti Hamalainen <ccr@tnsp.org> parents: 1485 diff changeset	908 if (!op->encFunction(op, buf, img, fmt))
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	909 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	910 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	911 "Encode op custom function failed: op #%d, "
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	912 "offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1486 bc13af8954d7 Add DMC64ImageFormat to C64 bitmap format encoding/decoding ops function parameters. Matti Hamalainen <ccr@tnsp.org> parents: 1485 diff changeset	913 i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
bc13af8954d7 Add DMC64ImageFormat to C64 bitmap format encoding/decoding ops function parameters. Matti Hamalainen <ccr@tnsp.org> parents: 1485 diff changeset	914 goto err;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	915 }
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	916 break;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	917 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	918 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	919
1534 acad4974dc09 Use the DMGrowBuf push/pop functionality to better implement the stacked Matti Hamalainen <ccr@tnsp.org> parents: 1528 diff changeset	920 dmGrowBufPop(buf);
acad4974dc09 Use the DMGrowBuf push/pop functionality to better implement the stacked Matti Hamalainen <ccr@tnsp.org> parents: 1528 diff changeset	921
1448 50402c225ef4 Do not insert load address to the buffer beginning in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1447 diff changeset	922 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	923
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	924 err:
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	925 return res;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	926 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	927
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	928
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	929 // 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	930 // 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	931 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	932 {
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	933 DMC64GetPixelFunc getPixel;
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	934
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	935 // Sanity check arguments
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	936 if (dst == NULL \|\| src == NULL)
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	937 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	938
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	939 if (dst->width < src->width \|\| dst->height < src->height)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	940 {
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	941 return dmError(DMERR_INVALID_DATA,
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	942 "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	943 src->width, src->height, dst->width, dst->height);
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	944 }
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	945
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	946 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	947
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	948 // Check pixel getter function
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	949 if (fmt->getPixel != NULL)
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	950 getPixel = fmt->getPixel;
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	951 else
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	952 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	953
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	954 // 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	955 int rwidth = src->width;
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	956 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	957 rwidth /= 2;
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	958
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	959 // Perform conversion
1411 a9afb2ad39cb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1396 diff changeset	960 Uint8 *dp = dst->data;
a9afb2ad39cb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1396 diff changeset	961 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	962 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	963 Uint8 *d = dp;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	964 const int y = yc / 8, yb = yc & 7;
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	965 const int scroffsy = y * src->chWidth;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	966 int xc;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	967
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	968 if (src->type & D64_FMT_CHAR)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	969 {
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	970 // Charmode conversion
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	971 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	972 // Hi-res charmap
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	973 for (xc = 0; xc < rwidth; xc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	974 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	975 const int x = xc / 8;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	976 const int scroffs = scroffsy + x;
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	977 const int chr = src->screen[0].data[scroffs];
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	978 const int v = 7 - (xc & 7);
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	979
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	980 if ((src->charData[0].data[chr * C64_CHR_SIZE + yb] >> v) & 1)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	981 *d++ = src->color[0].data[scroffs];
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	982 else
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	983 *d++ = src->bgcolor;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	984 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	985 else
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	986 // Multicolor variants
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	987 for (xc = 0; xc < rwidth; xc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	988 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	989 const int x = xc / 4;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	990 const int scroffs = scroffsy + x;
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	991 const int chr = src->screen[0].data[scroffs];
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	992 const int col = src->color[0].data[scroffs] & 15;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	993
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	994 if (col & 8)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	995 {
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	996 const int v = 6 - ((xc * 2) & 6);
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	997 switch ((src->charData[0].data[chr * C64_CHR_SIZE + yb] >> v) & 3)
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	998 {
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	999 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	1000 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	1001 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	1002 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	1003 }
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1004 }
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1005 else
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1006 {
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1007 const int v = 7 - (xc & 7);
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	1008 if ((src->charData[0].data[chr * C64_CHR_SIZE + yb] >> v) & 1)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	1009 *d++ = src->color[0].data[scroffs];
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1010 else
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1011 *d++ = src->bgcolor;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1012 }
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1013 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1014 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1015 else
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1016 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1017 // Perform generic BITMAP conversion
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	1018 const int bmoffsy = y * src->chWidth * 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	1019
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1020 if ((src->type & D64_FMT_MC) == D64_FMT_HIRES)
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1021 // Hi-res bitmap
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1022 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	1023 {
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1024 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	1025 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	1026 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	1027 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	1028
1387 14d79e4d82cf Oops, 100L. Had forgotten to change singlecolor mode handling pixel getter Matti Hamalainen <ccr@tnsp.org> parents: 1385 diff changeset	1029 *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	1030 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1031 else
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1032 // Multicolor bitmap and variants
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1033 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	1034 {
901 f532262f90b1 Actually fix commit 16aa5955dfb5. Matti Hamalainen <ccr@tnsp.org> parents: 857 diff changeset	1035 const int x = xc / 4;
f532262f90b1 Actually fix commit 16aa5955dfb5. Matti Hamalainen <ccr@tnsp.org> parents: 857 diff changeset	1036 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	1037 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	1038 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	1039
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1040 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	1041 {
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1042 switch (src->laceType)
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1043 {
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1044 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	1045 *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	1046 *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	1047 break;
1366 d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1048
d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1049 default:
d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1050 return DMERR_NOT_SUPPORTED;
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1051 }
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1052 }
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1053 else
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1054 {
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1055 *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	1056 }
529 1bce06b5026f Combine conversion of interlaced and normal multicolor images to one function. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	1057 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1058 }
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1059 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	1060 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1061
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	1062 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	1063 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1064
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1065
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1066 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	1067 {
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1068 int res;
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1069 DMImage *dst;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1070
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1071 if (pdst == NULL \|\| src == NULL)
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1072 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1073
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1074 // Allocate image structure
1289 4b025a96ad46 Fix. Matti Hamalainen <ccr@tnsp.org> parents: 1235 diff changeset	1075 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	1076 return DMERR_MALLOC;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1077
1426 4c7b456d7f0b Rename global dmC64Palette to dmDefaultC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 1425 diff changeset	1078 // Set partial palette information
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1079 dst->ncolors = C64_NCOLORS;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1080 dst->constpal = TRUE;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1081
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1082 // Convert
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1083 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	1084 res = fmt->convertFrom(dst, src, fmt);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1085 else
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1086 res = dmC64ConvertGenericBMP2Image(dst, src, fmt);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1087
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1088 return res;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1089 }
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1090
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1092 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	1093 const size_t probeOffs, const size_t loadOffs,
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	1094 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	1095 {
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1096 if (img == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1097 return DMERR_NULLPTR;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1098
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1099 // Check for forced format
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1100 if (forced != NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1101 *fmt = forced;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1102 else
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1103 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1104 // Nope, perform a generic probe
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1105 if (probeOffs >= len)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1106 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	1107
537 32d9e67da189 Rename generic probing function to match the style of other lib64gfx functions. Matti Hamalainen <ccr@tnsp.org> parents: 536 diff changeset	1108 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	1109 return DMERR_NOT_SUPPORTED;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1110 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1111
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1112 if (loadOffs >= len)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1113 return DMERR_INVALID_ARGS;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1114
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1115 if (*fmt == NULL)
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1116 return DMERR_NOT_SUPPORTED;
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1117
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1118 if (((*fmt)->flags & DM_FMT_RD) == 0)
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1119 return DMERR_NOT_SUPPORTED;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1120
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1121 // Allocate memory
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1122 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	1123 return DMERR_MALLOC;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1124
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1125 // 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	1126 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	1127 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	1128 else
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1129 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	1130 }
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1131
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1132
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1133 // Convert a generic bitmap image to DMC64Image
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1134 int dmC64ConvertGenericImage2BMP(DMC64Image dst, const DMImage src, const DMC64ImageFormat *fmt)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1135 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1136 if (dst == NULL \|\| src == NULL \|\| fmt == NULL)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1137 return DMERR_NULLPTR;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1138
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1139 return DMERR_OK;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1140 }
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1141
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1142
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1143 int dmC64ConvertImage2BMP(DMC64Image *pdst, const DMImage src, const DMC64ImageFormat *fmt)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1144 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1145 int res;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1146 DMC64Image *dst;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1147
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1148 if (pdst == NULL \|\| src == NULL)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1149 return DMERR_NULLPTR;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1150
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1151 // Allocate the basic C64 bitmap image structure
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1152 if ((*pdst = dst = dmC64ImageAlloc(fmt)) == NULL)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1153 return DMERR_MALLOC;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1154
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1155 // Convert
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1156 if (fmt->convertTo != NULL)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1157 res = fmt->convertTo(dst, src, fmt);
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1158 else
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1159 res = dmC64ConvertGenericImage2BMP(dst, src, fmt);
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1160
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1161 return res;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1162 }
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1163
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1164
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1165 int dmC64EncodeBMP(DMGrowBuf buf, const DMC64Image img, const DMC64ImageFormat *fmt)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1166 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1167 int res;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1168
1580 72f809e6eb3c Add NULL check for growbuf pointer. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1169 if (buf == NULL \|\| img == NULL \|\| fmt == NULL)
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1170 return DMERR_NULLPTR;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1171
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1172 if ((fmt->flags & DM_FMT_WR) == 0)
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1173 return DMERR_NOT_SUPPORTED;
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1174
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1175 // Allocate a buffer
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1176 if ((res = dmGrowBufAlloc(buf, BUF_SIZE_INITIAL, BUF_SIZE_GROW)) != DMERR_OK)
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1177 goto err;
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1178
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1179 // Add the loading address
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1180 if (!dmGrowBufPutU8(buf, DM_GET_ADDR_LO(fmt->addr)) \|\|
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1181 !dmGrowBufPutU8(buf, DM_GET_ADDR_HI(fmt->addr)))
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1182 goto err;
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1183
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1184 // Attempt to encode the image to a buffer
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1185 if (fmt->encode != NULL)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1186 res = fmt->encode(buf, img, fmt);
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1187 else
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1188 res = dmC64EncodeGenericBMP(FALSE, buf, img, fmt);
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1189
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1190 if (res != DMERR_OK)
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1191 goto err;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1192
1469 0046b4e1b35f Various fixes in bmp encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1467 diff changeset	1193 return DMERR_OK;
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1194
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1195 err:
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1196 dmGrowBufFree(buf);
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1197 return res;
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1198 }

Mercurial > hg > dmlib

annotate tools/lib64gfx.c @ 1647:948d6fda722d