dmlib: tools/lib64gfx.c annotate

annotate tools/lib64gfx.c @ 1720:77a4d8fab5cc

Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf.

author	Matti Hamalainen <ccr@tnsp.org>
date	Wed, 06 Jun 2018 15:19:40 +0300
parents	bed88d17f28c
children	c9a6f1dae756

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);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	92 if (op->type == DO_LAST)
1378 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
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	285 void dmGenericRLEAnalyze(const DMGrowBuf buf, DMCompParams cfg)
1503 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
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	295 for (size_t offs = 0; offs < buf->len; offs++)
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	296 stats[buf->data[offs]]++;
1542 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 ..
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	299 switch (cfg->type)
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	300 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	301 case DM_COMP_RLE_MARKER:
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	302 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	303 size_t selected = 0,
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	304 smallest = buf->len;
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	305
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	306 // Find least used byte value
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	307 for (size_t n = 0; n < DM_STAT_MAX; n++)
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	308 {
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	309 if (stats[n] < smallest)
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	310 {
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	311 cfg->rleMarkerW = selected;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	312 cfg->rleMarkerB = selected = n;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	313 smallest = stats[n];
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	314 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	315 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	316 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	317 break;
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	318
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	319 case DM_COMP_RLE_MASK:
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	320 cfg->rleMarkerMask = 0xC0;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	321 cfg->rleMarkerBits = 0xC0;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	322 cfg->rleCountMask = 0x3f;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	323 break;
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	324 }
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	325
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	326 dmFree(stats);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	327 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	328
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	329
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	330 void dmSetupRLEBuffers(DMGrowBuf dst, DMGrowBuf src, const DMCompParams *cfg)
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	331 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	332 if (cfg->flags & DM_RLE_BACKWARDS_INPUT)
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	333 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	334 src->offs = src->len - 1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	335 src->backwards = TRUE;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	336 }
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	337
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	338 if (cfg->flags & DM_RLE_BACKWARDS_OUTPUT)
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	339 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	340 dst->backwards = TRUE;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	341 dst->offs = dst->size - 1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	342 }
1718 bed88d17f28c Fix a commit blunder here .. Matti Hamalainen <ccr@tnsp.org> parents: 1717 diff changeset	343 }
bed88d17f28c Fix a commit blunder here .. Matti Hamalainen <ccr@tnsp.org> parents: 1717 diff changeset	344
bed88d17f28c Fix a commit blunder here .. Matti Hamalainen <ccr@tnsp.org> parents: 1717 diff changeset	345
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	346 void dmFinishRLEBuffers(DMGrowBuf dst, DMGrowBuf src, const DMCompParams *cfg)
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	347 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	348 if (cfg->flags & DM_RLE_BACKWARDS_OUTPUT)
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	349 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	350 memmove(dst->data, dst->data + dst->offs, dst->len);
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	351 dst->offs = 0;
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	352 }
1720 77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	353
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	354 switch (cfg->flags & DM_OUT_CROP_MASK)
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	355 {
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	356 case DM_OUT_CROP_END:
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	357 if (cfg->cropOutLen < dst->len)
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	358 {
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	359 memmove(dst->data, dst->data + dst->len - cfg->cropOutLen + 1, cfg->cropOutLen);
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	360 dst->len = cfg->cropOutLen;
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	361 }
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	362 break;
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	363
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	364 case DM_OUT_CROP_START:
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	365 if (cfg->cropOutLen <= dst->len)
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	366 dst->len = cfg->cropOutLen;
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	367 break;
77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	368 }
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	369 }
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	370
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	371
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	372 int dmGenericRLEOutputRun(DMGrowBuf dst, const DMCompParams cfg, const Uint8 data, const unsigned int count)
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	373 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	374 unsigned int scount;
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	375 for (scount = count; scount; scount--)
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	376 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	377 if (!dmGrowBufPutU8(dst, data))
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	378 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	379 return dmError(DMERR_MALLOC,
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	380 "%s: RLE: Could not output RLE run %d x 0x%02x @ "
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	381 "offs=0x%" DM_PRIx_SIZE_T ", size=0x%" DM_PRIx_SIZE_T ".\n",
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	382 cfg->func, count, data, dst->offs, dst->size);
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	383 }
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	384 }
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	385 return DMERR_OK;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	386 }
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	387
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	388
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	389 int dmDecodeGenericRLE(DMGrowBuf dst, const DMGrowBuf psrc, 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	390 {
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	391 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	392 Uint8 tmp1, tmp2, tmp3, data;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	393 DMGrowBuf src;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	395 // As we need to modify the offs, etc. but not the data,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	396 // we will just make a shallow copy of the DMGrowBuf struct
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	397 dmGrowBufConstCopy(&src, psrc);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	398 dmSetupRLEBuffers(dst, &src, cfg);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	399
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	400 while (dmGrowBufGetU8(&src, &data))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	402 unsigned int count = 1;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	403
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	404 if (cfg->type == DM_COMP_RLE_MARKER)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	406 // A simple marker byte RLE variant: [Marker] [count] [data]
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	407 if (data == cfg->rleMarkerB && (cfg->flags & DM_RLE_BYTE_RUNS))
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	408 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	409 if (!dmGrowBufGetU8(&src, &tmp1) \|\|
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	410 !dmGrowBufGetU8(&src, &tmp2))
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	411 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	412 res = DMERR_INVALID_DATA;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	413 goto out;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	414 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	415 switch (cfg->flags & DM_RLE_ORDER_MASK)
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	416 {
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	417 case DM_RLE_ORDER_1:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	418 count = tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	419 data = tmp2;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	420 break;
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	421
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	422 case DM_RLE_ORDER_2:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	423 data = tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	424 count = tmp2;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	425 break;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	426 }
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	427 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	428 else
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	429 if (data == cfg->rleMarkerW && (cfg->flags & DM_RLE_WORD_RUNS))
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	430 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	431 if (!dmGrowBufGetU8(&src, &tmp1) \|\|
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	432 !dmGrowBufGetU8(&src, &tmp2) \|\|
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	433 !dmGrowBufGetU8(&src, &tmp3))
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	434 {
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	435 res = DMERR_INVALID_DATA;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	436 goto out;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	437 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	438 switch (cfg->flags & DM_RLE_ORDER_MASK)
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	439 {
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	440 case DM_RLE_ORDER_1:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	441 count = (tmp2 << 8) \| tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	442 data = tmp3;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	443 break;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	444
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	445 case DM_RLE_ORDER_2:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	446 data = tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	447 count = (tmp3 << 8) \| tmp2;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	448 break;
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	449 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	450 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	451 }
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	452 else
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	453 if (cfg->type == DM_COMP_RLE_MASK)
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	454 {
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	455 // Mask marker RLE: usually high bit(s) of byte mark RLE sequence
9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	456 // and the lower bits contain the count: [Mask + count] [data]
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	457 if ((data & cfg->rleMarkerMask) == cfg->rleMarkerBits)
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	458 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	459 if (!dmGrowBufGetU8(&src, &tmp1))
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	460 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	461 res = DMERR_INVALID_DATA;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	462 goto out;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	463 }
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	464
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	465 count = data & cfg->rleCountMask;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	466 data = tmp1;
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	467 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 }
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	469
1715 c0c6fd8b288a Use dmGenericRLEOutputRun(). Matti Hamalainen <ccr@tnsp.org> parents: 1713 diff changeset	470 if ((res = dmGenericRLEOutputRun(dst, cfg, data, count)) != DMERR_OK)
c0c6fd8b288a Use dmGenericRLEOutputRun(). Matti Hamalainen <ccr@tnsp.org> parents: 1713 diff changeset	471 goto out;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 }
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	473
1717 7de37c01dbd4 Use dmFinishRLEBuffers() in dmDecodeGenericRLE() Matti Hamalainen <ccr@tnsp.org> parents: 1716 diff changeset	474 dmFinishRLEBuffers(dst, &src, cfg);
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	475 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	476
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	477 out:
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	478 return res;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	479 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	480
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	481
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	482 int dmDecodeGenericRLEAlloc(DMGrowBuf dst, const DMGrowBuf src, const DMCompParams *cfg)
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	483 {
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	484 int res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	485 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	486 return res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	487
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	488 return dmDecodeGenericRLE(dst, src, cfg);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	489 }
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
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	492 int dmEncodeGenericRLESequence(DMGrowBuf dst, const Uint8 data, const unsigned int count, const DMCompParams cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	493 {
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	494 BOOL copyOnly = FALSE;
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	495 int res;
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	496
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 switch (cfg->type)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	498 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	499 case DM_COMP_RLE_MARKER:
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	500 if ((cfg->flags & DM_RLE_WORD_RUNS) &&
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	501 (count >= cfg->rleMinCountW \|\| data == cfg->rleMarkerW))
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	502 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	503 // A simple marker byte RLE variant: [Marker] [count] [data]
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	504 if (!dmGrowBufPutU8(dst, cfg->rleMarkerW))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	505 goto err;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	506
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	507 switch (cfg->flags & DM_RLE_ORDER_MASK)
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	508 {
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	509 case DM_RLE_ORDER_1:
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	510 if (!dmGrowBufPutU16LE(dst, count) \|\|
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	511 !dmGrowBufPutU8(dst, data))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	512 goto err;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	513 break;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	514
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	515 case DM_RLE_ORDER_2:
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	516 if (!dmGrowBufPutU8(dst, data) \|\|
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	517 !dmGrowBufPutU16LE(dst, count))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	518 goto err;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	519 break;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	520 }
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	521 }
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	522 else
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	523 if ((cfg->flags & DM_RLE_BYTE_RUNS) &&
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	524 (count >= cfg->rleMinCountB \|\| data == cfg->rleMarkerB))
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	525 {
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	526 // A simple marker byte RLE variant: [Marker] [count] [data]
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	527 if (!dmGrowBufPutU8(dst, cfg->rleMarkerB))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	528 goto err;
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	529
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	530 switch (cfg->flags & DM_RLE_ORDER_MASK)
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	531 {
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	532 case DM_RLE_ORDER_1:
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	533 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	534 !dmGrowBufPutU8(dst, data))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	535 goto err;
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	536 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	537
1650 9233da9de92c Refactor RLE encoding a bit, and add support for 16bit run counts and make things more configurable. Matti Hamalainen <ccr@tnsp.org> parents: 1647 diff changeset	538 case DM_RLE_ORDER_2:
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	539 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	540 !dmGrowBufPutU8(dst, count))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	541 goto err;
1573 86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	542 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	543 }
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	544 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	545 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	546 copyOnly = TRUE;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	547 break;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	548
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	549 case DM_COMP_RLE_MASK:
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	550 if (count >= cfg->rleMinCountB \|\| (data & cfg->rleMarkerMask) == cfg->rleMarkerBits)
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	551 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	552 // 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	553 // and the lower bits contain the count: [Mask + count] [data]
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	554 if (!dmGrowBufPutU8(dst, cfg->rleMarkerBits \| count) \|\|
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	555 !dmGrowBufPutU8(dst, data))
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	556 goto err;
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	557 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	558 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	559 copyOnly = TRUE;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	560 break;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	561 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	562
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	563 if (copyOnly && (res = dmGenericRLEOutputRun(dst, cfg, data, count)) != DMERR_OK)
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	564 return res;
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	565
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	566 return DMERR_OK;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	567
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	568 err:
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	569 return dmError(DMERR_MALLOC,
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	570 "%s: RLE: Could not output RLE sequence %d x 0x%02x.\n",
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	571 cfg->func, count, data);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	572 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	573
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	574
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	575 int dmEncodeGenericRLE(DMGrowBuf dst, const DMGrowBuf psrc, const DMCompParams *cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	576 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	577 DMGrowBuf src;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	578 unsigned int count = 0;
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	579 int prev = -1, res = DMERR_OK;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	580 Uint8 data;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	581
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	582 // As we need to modify the offs, etc. but not the data,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	583 // we will just make a shallow copy of the DMGrowBuf struct
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	584 dmGrowBufConstCopy(&src, psrc);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	585 dmSetupRLEBuffers(dst, &src, cfg);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	586
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	587 while (dmGrowBufGetU8(&src, &data))
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	588 {
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	589 // If new data byte is different, or we exceed the rleMaxCount
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	590 // for the active runs mode(s) .. then encode the run.
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	591 if (data != prev \|\|
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	592 ((cfg->flags & DM_RLE_WORD_RUNS) && count >= cfg->rleMaxCountW) \|\|
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	593 (((cfg->flags & DM_RLE_RUNS_MASK) == DM_RLE_BYTE_RUNS) && count >= cfg->rleMaxCountB))
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	594 {
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	595 if ((res = dmEncodeGenericRLESequence(dst, prev, count, cfg)) != DMERR_OK)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	596 goto err;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	597
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	598 count = 1;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	599 }
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	600 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	601 count++;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	602
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	603 prev = data;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	604 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	605
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	606 // If there is anything left in the output queue ..
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	607 if ((res = dmEncodeGenericRLESequence(dst, prev, count, cfg)) != DMERR_OK)
1518 24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	608 goto err;
24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	609
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	610 dmFinishRLEBuffers(dst, &src, cfg);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	611
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	612 err:
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	613 return res;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	614 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	615
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	616
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	617 int dmEncodeGenericRLEAlloc(DMGrowBuf dst, const DMGrowBuf src, const DMCompParams *cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	618 {
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	619 int res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	620 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	621 return res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	622
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	623 return dmEncodeGenericRLE(dst, src, 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	624 }
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	625
519 feaaf0e2ecbe Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	626
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	627 // Perform probing of the given data buffer, trying to determine
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	628 // if it contains a supported "C64" image format. Returns the
63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	629 // "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	630 // 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	631 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	632 {
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	633 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	634
1380 959b34402b81 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1378 diff changeset	635 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	636 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	637 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	638 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	639 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	640 {
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	641 // 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	642 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	643 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	644 }
4cdcaeb68b54 Collapse most of the probing functions into one generic probe, as they only Matti Hamalainen <ccr@tnsp.org> parents: 510 diff changeset	645 else
1134 d0898867ec4c Various fixes for issues reported by clang static analyzer. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	646 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	647 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	648
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 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	650 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 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	652 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	653 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 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	657 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 *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	659 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	660 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 else
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	662 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	663 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
1537 776aa43b2c57 Tiny improvement in MC->FLI upconversion. Matti Hamalainen <ccr@tnsp.org> parents: 1534 diff changeset	666 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	667 {
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	668 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	669 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	670 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	671 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	672 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	673 switch (op->subject)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	674 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	675 case DS_COLOR_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	676 case DS_BITMAP_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	677 case DS_SCREEN_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	678 case DS_CHAR_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	679 if (op->bank < 0 \|\| op->bank > img->nbanks)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	680 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	681 return dmError(DMERR_INTERNAL,
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	682 "Invalid bank %d / %d definition in generic encode/decode operator %d @ #%d.\n",
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	683 op->bank, img->nbanks, op->type, i);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	684 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	685 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	686
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	687 case DS_EXTRA_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	688 if (op->bank < 0 \|\| op->bank >= C64_MAX_EXTRA_DATA)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	689 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	690 return dmError(DMERR_INTERNAL,
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	691 "Invalid bank %d definition in generic encode/decode operator %d @ #%d.\n",
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	692 op->bank, op->type, i);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	693 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	694 break;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	695 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	696 break;
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	697
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	698 // Just list the allowed ops here
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	699 case DO_DEC_FUNC:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	700 case DO_ENC_FUNC:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	701 case DO_CHAR_CFG:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	702 case DO_LAST:
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	703 break;
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	704
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	705 default:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	706 return dmError(DMERR_INTERNAL,
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	707 "Invalid op type %d in generic encode/decode operator @ #%d.\n",
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	708 op->type, i);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	709 break;
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	710 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	711
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	712 return DMERR_OK;
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	713 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	714
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	715
1537 776aa43b2c57 Tiny improvement in MC->FLI upconversion. Matti Hamalainen <ccr@tnsp.org> parents: 1534 diff changeset	716 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	717 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	718 // Default to size of 0
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	719 *size = 0;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	720
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	721 switch (op->type)
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	722 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	723 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	724 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	725 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	726 switch (op->subject)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	727 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	728 case DS_SCREEN_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	729 case DS_COLOR_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	730 size = fmt->chHeight fmt->chWidth;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	731 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	732
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	733 case DS_BITMAP_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	734 size = fmt->chHeight fmt->chWidth * 8;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	735 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	736
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	737 case DS_CHAR_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	738 size = C64_MAX_CHARS C64_CHR_SIZE;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	739 break;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	740
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	741 case DS_D020:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	742 case DS_BGCOL:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	743 case DS_D021:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	744 case DS_D022:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	745 case DS_D023:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	746 case DS_D024:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	747 *size = 1;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	748 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	749 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	750 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	751
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	752 // 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	753 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	754 *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	755
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	756 return TRUE;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	757 }
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	758
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	759
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	760 void dmC64GetOpMemBlockAndName(const DMC64Image img, const int subject, const int bank, const DMC64MemBlock blk, char *blkname)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	761 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	762 switch (subject)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	763 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	764 case DS_COLOR_RAM : blk = &img->color[bank]; blkname = "Color RAM"; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	765 case DS_SCREEN_RAM : blk = &img->screen[bank]; blkname = "Screen RAM"; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	766 case DS_BITMAP_RAM : blk = &img->bitmap[bank]; blkname = "Bitmap RAM"; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	767 case DS_CHAR_DATA : blk = &img->charData[bank]; blkname = "Character data"; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	768 case DS_EXTRA_DATA : blk = &img->extraData[bank]; blkname = "Extra data"; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	769 default: blk = NULL; blkname = NULL; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	770 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	771 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	772
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	773
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	774 int dmC64DecodeGenericBMP(DMC64Image img, const DMGrowBuf buf, 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	775 {
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	776 int res = DMERR_OK;
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	777
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	778 if (buf == NULL \|\| buf->data == NULL \|\| img == NULL \|\| fmt == NULL)
513 486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	779 return DMERR_NULLPTR;
486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	780
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	781 // 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	782 img->type = fmt->type;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	783 img->width = fmt->width;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	784 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	785 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	786 img->chHeight = fmt->chHeight;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	787 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	788
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	789 // Perform decoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	790 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	791 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	792 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	793 const Uint8 *src;
1600 e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	794 DMC64MemBlock *blk = NULL;
e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	795 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	796 size_t size;
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	797 Uint8 value;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	798
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	799 // Check for last operator
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	800 if (op->type == DO_LAST)
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	801 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	802
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	803 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	804 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	805 return res;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	806
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	807 // Check size
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	808 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	809 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	810 return dmError(DMERR_INVALID_DATA,
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	811 "Decode op SIZE out of bounds, op #%d type=%d, subj=%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	812 "bank=%d, size=%d ($%04x) vs. allocated %d ($%04x)\n",
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	813 i, op->type, op->subject, op->offs, op->offs, op->bank, size, size, op->size, op->size);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	814 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	815
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	816 // Is the operation inside the bounds?
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	817 if (op->offs + size > buf->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	818 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	819 return dmError(DMERR_INVALID_DATA,
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	820 "Decode DATA out of bounds, op #%d type=%d, subj=%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	821 "bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	822 i, op->type, op->subject, op->offs, op->offs, op->bank,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	823 size, size, buf->len, buf->len);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	825
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	826 src = buf->data + op->offs;
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	827
aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	828 // 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	829 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	830 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	831 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	832 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	833 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	834 switch (op->subject)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	835 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	836 case DS_COLOR_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	837 case DS_SCREEN_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	838 case DS_BITMAP_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	839 case DS_CHAR_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	840 case DS_EXTRA_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	841 // XXX BZZZT .. a nasty cast here --v
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	842 dmC64GetOpMemBlockAndName(img, op->subject, op->bank, (const DMC64MemBlock **) &blk, &blkname);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	843 if ((dmC64MemBlockAlloc(blk, size)) != DMERR_OK)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	844 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	845 return dmError(DMERR_MALLOC,
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	846 "Could not allocate '%s' block! "
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	847 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	848 blkname, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	849 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	850 switch (op->type)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	851 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	852 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	853 memcpy(blk->data, src, size);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	854 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	855
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	856 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	857 memset(blk->data, *src, size);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	858 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	859
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	860 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	861 memset(blk->data, op->offs, size);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	862 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	863 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	864 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	865
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	866 case DS_D020:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	867 case DS_BGCOL:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	868 case DS_D021:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	869 case DS_D022:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	870 case DS_D023:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	871 case DS_D024:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	872 switch (op->type)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	873 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	874 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	875 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	876 value = *src;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	877 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	878
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	879 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	880 value = op->offs;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	881 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	882
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	883 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	884 switch (op->subject)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	885 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	886 case DS_D020: img->d020 = value; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	887 case DS_BGCOL:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	888 case DS_D021: img->bgcolor = value; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	889 case DS_D022: img->d022 = value; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	890 case DS_D023: img->d023 = value; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	891 case DS_D024: img->d024 = value; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	892 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	893 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	894
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	895 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	896 return dmError(DMERR_INTERNAL,
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	897 "Unhandled subject %d in "
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	898 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	899 op->subject, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	900 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	901 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	902
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	903 case DO_CHAR_CFG:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	904 switch (op->subject)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	905 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	906 case D64_CHCFG_SCREEN:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	907 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	908
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	909 case D64_CHCFG_LINEAR:
1672 09adf5328510 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1668 diff changeset	910 for (int bank = 0; bank < img->nbanks; bank++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	911 {
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	912 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	913 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	914 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	915 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	916
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	917 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	918 return dmError(DMERR_INTERNAL,
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	919 "Unhandled DO_CHAR_CFG mode %d in ",
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	920 "op #%d, bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	921 op->subject, i, op->bank, size, size, buf->len, buf->len);
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	922 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	923 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	924
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	925 case DO_DEC_FUNC:
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	926 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	927 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	928 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	929 "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	930 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	931 i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932 }
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	933 if (!op->decFunction(img, op, buf, 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	934 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	935 return dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	936 "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	937 "offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	938 i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942 }
916 3985f596ece5 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 915 diff changeset	943
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	944 // 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	945 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	946 {
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	947 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	948 "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	949 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	950 }
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	951
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	952 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	953 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	954
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	955
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	956 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	957 {
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	958 int res = DMERR_OK;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	959
1469 0046b4e1b35f Various fixes in bmp encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1467 diff changeset	960 if (img == NULL \|\| fmt == NULL)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	961 return DMERR_NULLPTR;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	962
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	963 // Allocate the output buffer if requested
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	964 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	965 {
1472 b9d3577d8290 Improve error handling and checking. Matti Hamalainen <ccr@tnsp.org> parents: 1471 diff changeset	966 dmError(res,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	967 "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	968 fmt->size);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	969 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	970 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	971
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	972 if (buf->backwards)
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	973 {
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	974 dmError(DMERR_INVALID_DATA,
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	975 "Buffer specified for dmC64EncodeGenericBMP() is in backwards mode, which is not supported.\n");
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	976 goto err;
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	977 }
1506 4fd4e7a00db4 Fix handling of predefined DMGrowBuffer in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1505 diff changeset	978
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	979 // Perform encoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	980 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	981 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	982 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	983 size_t size, chksize;
1600 e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	984 const DMC64MemBlock *blk = NULL;
e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	985 char *blkname = NULL;
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	986 Uint8 value;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	987
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	988 // Check for last operator
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	989 if (op->type == DO_LAST)
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	990 break;
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	991
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	992 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	993 if ((res = dmC64SanityCheckEncDecOp(i, op, img)) != DMERR_OK)
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	994 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	995
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	996 // Check size
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	997 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	998 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	999 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	1000 "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	1001 "bank=%d, size=%d ($%04x) vs. allocated %d ($%04x)\n",
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1002 i, op->type, op->offs, op->offs, op->bank, size, size, buf->size, buf->size);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1003 goto err;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1004 }
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1005
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1006 // Do we need to reallocate some more space?
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1007 chksize = buf->offs + 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	1008 if (!dmGrowBufCheckGrow(buf, chksize))
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1009 {
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	1010 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	1011 "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	1012 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	1013 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1014 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1015
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1016 // Perform operation
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1017 Uint8 *dst = buf->data + buf->offs + op->offs;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1018 switch (op->type)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1019 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1020 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1021 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1022 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1023 switch (op->subject)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1024 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1025 case DS_COLOR_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1026 case DS_SCREEN_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1027 case DS_BITMAP_RAM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1028 case DS_CHAR_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1029 case DS_EXTRA_DATA:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1030 dmC64GetOpMemBlockAndName(img, op->subject, op->bank, &blk, &blkname);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1031 switch (op->type)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1032 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1033 case DO_COPY:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1034 if (blk->data == NULL)
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1035 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1036 res = dmError(DMERR_NULLPTR,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1037 "'%s' block is NULL in "
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1038 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1039 blkname, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1040 goto err;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1041 }
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1042 if (size > blk->size)
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1043 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1044 res = dmError(DMERR_INTERNAL,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1045 "'%s' size mismatch %d <> %d in "
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1046 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1047 blkname, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1048 goto err;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1049 }
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1050 memcpy(dst, blk->data, size);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1051 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1052
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1053 case DO_SET_MEM:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1054 // This operation makes no sense, so do nothing
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1055 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1056
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1057 case DO_SET_OP:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1058 memset(dst, op->offs, size);
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1059 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1060 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1061 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1062
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1063 case DS_D020:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1064 case DS_BGCOL:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1065 case DS_D021:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1066 case DS_D022:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1067 case DS_D023:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1068 case DS_D024:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1069 switch (op->subject)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1070 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1071 case DS_D020: value = img->d020; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1072 case DS_BGCOL:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1073 case DS_D021: value = img->bgcolor; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1074 case DS_D022: value = img->d022; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1075 case DS_D023: value = img->d023; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1076 case DS_D024: value = img->d024; break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1077 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1078 switch (op->type)
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1079 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1080 case DO_COPY:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1081 case DO_SET_MEM:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1082 *dst = value;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1083 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1084
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1085 case DO_SET_OP:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1086 // Do nothing in this case
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1087 break;
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1088 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1089 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1090
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1091 default:
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1092 return dmError(DMERR_INTERNAL,
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1093 "Unhandled subject %d in "
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1094 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1095 op->subject, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1096 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1097 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1098
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1099 case DO_ENC_FUNC:
1482 df6dacb48970 Rename some struct members, and sanitize handling of DMC64Image allocation more. Matti Hamalainen <ccr@tnsp.org> parents: 1478 diff changeset	1100 if (op->encFunction == NULL)
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1101 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1102 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1103 "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	1104 "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	1105 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	1106 goto err;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1107 }
1486 bc13af8954d7 Add DMC64ImageFormat to C64 bitmap format encoding/decoding ops function parameters. Matti Hamalainen <ccr@tnsp.org> parents: 1485 diff changeset	1108 if (!op->encFunction(op, buf, img, fmt))
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1109 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1110 res = dmError(DMERR_INTERNAL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1111 "Encode op custom function failed: op #%d, "
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1112 "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	1113 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	1114 goto err;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1115 }
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1116 break;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1117 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1118 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1119
1448 50402c225ef4 Do not insert load address to the buffer beginning in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1447 diff changeset	1120 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	1121
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1122 err:
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1123 return res;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1124 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1125
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1126
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1127 // 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	1128 // 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	1129 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	1130 {
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1131 DMC64GetPixelFunc getPixel;
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1132
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1133 // Sanity check arguments
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1134 if (dst == NULL \|\| src == NULL)
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1135 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1136
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1137 if (dst->width < src->width \|\| dst->height < src->height)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1138 {
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1139 return dmError(DMERR_INVALID_DATA,
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1140 "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	1141 src->width, src->height, dst->width, dst->height);
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1142 }
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1143
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	1144 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	1145
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1146 // Check pixel getter function
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1147 if (fmt->getPixel != NULL)
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1148 getPixel = fmt->getPixel;
f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1149 else
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1150 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	1151
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1152 // 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	1153 int rwidth = src->width;
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1154 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	1155 rwidth /= 2;
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1156
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1157 // Perform conversion
1411 a9afb2ad39cb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1396 diff changeset	1158 Uint8 *dp = dst->data;
a9afb2ad39cb Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1396 diff changeset	1159 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	1160 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1161 Uint8 *d = dp;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1162 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	1163 const int scroffsy = y * src->chWidth;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1164 int xc;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1165
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1166 if (src->type & D64_FMT_CHAR)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1167 {
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1168 // Charmode conversion
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1169 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	1170 // Hi-res charmap
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1171 for (xc = 0; xc < rwidth; xc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1172 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1173 const int x = xc / 8;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1174 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	1175 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	1176 const int v = 7 - (xc & 7);
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1177
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	1178 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	1179 *d++ = src->color[0].data[scroffs];
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1180 else
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1181 *d++ = src->bgcolor;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1182 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1183 else
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1184 // Multicolor variants
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1185 for (xc = 0; xc < rwidth; xc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1186 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1187 const int x = xc / 4;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1188 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	1189 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	1190 const int col = src->color[0].data[scroffs] & 15;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	1191
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1192 if (col & 8)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1193 {
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1194 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	1195 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	1196 {
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1197 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	1198 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	1199 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	1200 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	1201 }
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1202 }
944 c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1203 else
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1204 {
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1205 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	1206 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	1207 *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	1208 else
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1209 *d++ = src->bgcolor;
c62bb4028cf0 Implement multicolor / standard switching support based on color ram value's Matti Hamalainen <ccr@tnsp.org> parents: 943 diff changeset	1210 }
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1211 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1212 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1213 else
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1214 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1215 // 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	1216 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	1217
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1218 if ((src->type & D64_FMT_MC) == D64_FMT_HIRES)
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1219 // Hi-res bitmap
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1220 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	1221 {
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1222 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	1223 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	1224 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	1225 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	1226
1387 14d79e4d82cf Oops, 100L. Had forgotten to change singlecolor mode handling pixel getter Matti Hamalainen <ccr@tnsp.org> parents: 1385 diff changeset	1227 *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	1228 }
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1229 else
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1230 // Multicolor bitmap and variants
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1231 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	1232 {
901 f532262f90b1 Actually fix commit 16aa5955dfb5. Matti Hamalainen <ccr@tnsp.org> parents: 857 diff changeset	1233 const int x = xc / 4;
f532262f90b1 Actually fix commit 16aa5955dfb5. Matti Hamalainen <ccr@tnsp.org> parents: 857 diff changeset	1234 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	1235 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	1236 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	1237
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1238 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	1239 {
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1240 switch (src->laceType)
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1241 {
7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1242 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	1243 *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	1244 *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	1245 break;
1366 d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1246
d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1247 default:
d4387509a363 Return DMERR_NOT_SUPPORTED for decoding color-interlaced images, for now Matti Hamalainen <ccr@tnsp.org> parents: 1365 diff changeset	1248 return DMERR_NOT_SUPPORTED;
1362 7bc67ba68904 Better handling of resolution interlaced pictures. Matti Hamalainen <ccr@tnsp.org> parents: 1361 diff changeset	1249 }
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1250 }
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1251 else
5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1252 {
1376 67ae449cf9e1 More work on making various FLI etc. format decoding more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1375 diff changeset	1253 *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	1254 }
529 1bce06b5026f Combine conversion of interlaced and normal multicolor images to one function. Matti Hamalainen <ccr@tnsp.org> parents: 528 diff changeset	1255 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256 }
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1257 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	1258 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	1260 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	1261 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1264 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	1265 {
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1266 int res;
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1267 DMImage *dst;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1268
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1269 if (pdst == NULL \|\| src == NULL)
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1270 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1271
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1272 // Allocate image structure
1289 4b025a96ad46 Fix. Matti Hamalainen <ccr@tnsp.org> parents: 1235 diff changeset	1273 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	1274 return DMERR_MALLOC;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1275
1426 4c7b456d7f0b Rename global dmC64Palette to dmDefaultC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 1425 diff changeset	1276 // Set partial palette information
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1277 dst->ncolors = C64_NCOLORS;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1278 dst->constpal = TRUE;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1279
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1280 // Convert
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1281 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	1282 res = fmt->convertFrom(dst, src, fmt);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1283 else
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1284 res = dmC64ConvertGenericBMP2Image(dst, src, fmt);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1285
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1286 return res;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1287 }
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1288
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1289
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1290 int dmC64DecodeBMP(DMC64Image *img, const DMGrowBuf buf,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1291 const size_t probeOffs, const size_t loadOffs,
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	1292 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	1293 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1294 DMGrowBuf tmp;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1295
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1296 if (img == NULL \|\| buf == NULL)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1297 return DMERR_NULLPTR;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1298
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1299 // Check for forced format
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1300 if (forced != NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1301 *fmt = forced;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1302 else
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1303 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1304 // Nope, perform a generic probe
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1305 if (probeOffs >= buf->len)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1306 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	1307
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1308 dmGrowBufCreateFromOffs(&tmp, buf, probeOffs);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1309 if (dmC64ProbeBMP(tmp.data, tmp.len, fmt) == DM_PROBE_SCORE_FALSE)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1310 return DMERR_NOT_SUPPORTED;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1311 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1312
1710 1f0fac3af8e3 Use buf->len instead of tmp.len, as it might not be initialized. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1313 if (loadOffs >= buf->len)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1314 return DMERR_INVALID_ARGS;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1315
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1316 if (*fmt == NULL)
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1317 return DMERR_NOT_SUPPORTED;
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1318
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1319 // Format supports only reading?
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1320 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	1321 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	1322
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1323 // Allocate memory
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1324 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	1325 return DMERR_MALLOC;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1326
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1327 dmGrowBufCreateFromOffs(&tmp, buf, loadOffs);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1328
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1329 // 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	1330 if ((*fmt)->decode != NULL)
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1331 return (fmt)->decode(img, &tmp, *fmt);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1332 else
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1333 return dmC64DecodeGenericBMP(img, &tmp, fmt);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1334 }
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1335
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1336
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1337 // 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	1338 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	1339 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1340 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	1341 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	1342
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1343 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	1344 }
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1345
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1346
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1347 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	1348 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1349 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	1350 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	1351
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1352 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	1353 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	1354
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1355 // 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	1356 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	1357 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	1358
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1359 // Convert
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1360 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	1361 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	1362 else
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1363 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	1364
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1365 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	1366 }
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1367
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1368
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1369 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	1370 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1371 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	1372
1580 72f809e6eb3c Add NULL check for growbuf pointer. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1373 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	1374 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	1375
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1376 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	1377 return DMERR_NOT_SUPPORTED;
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1378
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1379 // Allocate a buffer
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1380 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	1381 goto err;
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1382
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1383 // Add the loading address
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1384 if (!dmGrowBufPutU8(buf, DM_GET_ADDR_LO(fmt->addr)) \|\|
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1385 !dmGrowBufPutU8(buf, DM_GET_ADDR_HI(fmt->addr)))
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1386 goto err;
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1387
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1388 // 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	1389 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	1390 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	1391 else
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1392 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	1393
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1394 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	1395 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	1396
1469 0046b4e1b35f Various fixes in bmp encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1467 diff changeset	1397 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	1398
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1399 err:
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1400 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	1401 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	1402 }

Mercurial > hg > dmlib

annotate tools/lib64gfx.c @ 1720:77a4d8fab5cc