dmlib: tools/lib64gfx.c annotate

annotate tools/lib64gfx.c @ 2204:cbac4912992c

Add new module "lib64util", and move some functions there from lib64gfx that do not strictly belong.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 14 Jun 2019 03:24:24 +0300
parents	b259312ddb59
children	7694b5c8edc1

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
2120 88d37ec1b4d6 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 2118 diff changeset	5 * (C) Copyright 2012-2019 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
2175 58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	15 //
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	16 // Some "default" C64 palettes
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	17 //
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	18 DMC64Palette dmC64DefaultPalettes[] =
1731 474055f25ab0 Move dmDefaultC64Palette back to lib64gfx.c Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	19 {
2175 58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	20 {
2203 b259312ddb59 Add description field to DMC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	21 "pepto",
b259312ddb59 Add description field to DMC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	22 "Pepto's classic (default)",
2175 58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	23 {
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	24 { 0x00, 0x00, 0x00, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	25 { 0xFF, 0xFF, 0xFF, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	26 { 0x68, 0x37, 0x2B, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	27 { 0x70, 0xA4, 0xB2, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	28 { 0x6F, 0x3D, 0x86, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	29 { 0x58, 0x8D, 0x43, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	30 { 0x35, 0x28, 0x79, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	31 { 0xB8, 0xC7, 0x6F, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	32 { 0x6F, 0x4F, 0x25, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	33 { 0x43, 0x39, 0x00, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	34 { 0x9A, 0x67, 0x59, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	35 { 0x44, 0x44, 0x44, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	36 { 0x6C, 0x6C, 0x6C, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	37 { 0x9A, 0xD2, 0x84, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	38 { 0x6C, 0x5E, 0xB5, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	39 { 0x95, 0x95, 0x95, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	40 },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	41 },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	42 {
2203 b259312ddb59 Add description field to DMC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	43 "colodore",
2175 58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	44 "Colodore",
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	45 {
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	46 { 0x00, 0x00, 0x00, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	47 { 0xff, 0xff, 0xff, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	48 { 0x96, 0x28, 0x2e, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	49 { 0x5b, 0xd6, 0xce, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	50 { 0x9f, 0x2d, 0xad, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	51 { 0x41, 0xb9, 0x36, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	52 { 0x27, 0x24, 0xc4, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	53 { 0xef, 0xf3, 0x47, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	54 { 0x9f, 0x48, 0x15, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	55 { 0x5e, 0x35, 0x00, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	56 { 0xda, 0x5f, 0x66, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	57 { 0x47, 0x47, 0x47, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	58 { 0x78, 0x78, 0x78, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	59 { 0x91, 0xff, 0x84, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	60 { 0x68, 0x64, 0xff, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	61 { 0xae, 0xae, 0xae, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	62 },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	63 },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	64 {
2203 b259312ddb59 Add description field to DMC64Palette. Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	65 "vice3",
2175 58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	66 "VICE 3.3",
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	67 {
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	68 { 0x00, 0x00, 0x00, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	69 { 0xfd, 0xfe, 0xfc, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	70 { 0xbe, 0x1a, 0x24, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	71 { 0x30, 0xe6, 0xc6, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	72 { 0xb4, 0x1a, 0xe2, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	73 { 0x1f, 0xd2, 0x1e, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	74 { 0x21, 0x1b, 0xae, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	75 { 0xdf, 0xf6, 0x0a, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	76 { 0xb8, 0x41, 0x04, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	77 { 0x6a, 0x33, 0x04, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	78 { 0xfe, 0x4a, 0x57, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	79 { 0x42, 0x45, 0x40, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	80 { 0x70, 0x74, 0x6f, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	81 { 0x59, 0xfe, 0x59, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	82 { 0x5f, 0x53, 0xfe, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	83 { 0xa4, 0xa7, 0xa2, 0xff },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	84 },
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	85 },
1731 474055f25ab0 Move dmDefaultC64Palette back to lib64gfx.c Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	86 };
474055f25ab0 Move dmDefaultC64Palette back to lib64gfx.c Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	87
2175 58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	88 const int ndmC64DefaultPalettes = sizeof(dmC64DefaultPalettes) / sizeof(dmC64DefaultPalettes[0]);
58fab91830d5 Change default C64 palette system a bit, add two more palettes. These are Matti Hamalainen <ccr@tnsp.org> parents: 2172 diff changeset	89
1731 474055f25ab0 Move dmDefaultC64Palette back to lib64gfx.c Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	90
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	91 int dmC64SetImagePalette(DMImage img, const DMC64Palette ppal, const BOOL mixed)
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	92 {
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	93 const DMC64Palette *cpal = ppal;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2061 diff changeset	94 int res;
2131 781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	95
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	96 if (img == NULL)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	97 return DMERR_NULLPTR;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	98
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	99 if (cpal == NULL)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	100 cpal = &dmC64DefaultPalettes[0];
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	101
2131 781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	102 // Free previous palette
781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	103 if (!img->constpal)
781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	104 dmPaletteFree(img->pal);
781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	105
781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	106 img->constpal = FALSE;
781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	107
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	108 // Allocate and create new
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	109 if (mixed)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	110 {
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	111 // Mixed 256 color palette
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	112 if ((res = dmPaletteAlloc(&(img->pal), D64_NCOLORS * D64_NCOLORS, -1)) != DMERR_OK)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	113 return res;
2131 781b1d63109a Free previously allocated palette in the image palette allocation functions if it Matti Hamalainen <ccr@tnsp.org> parents: 2128 diff changeset	114
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	115 for (int n1 = 0, n = 0; n1 < D64_NCOLORS; n1++)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	116 {
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	117 const DMColor *col1 = &cpal->colors[n1];
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	118 for (int n2 = 0; n2 < D64_NCOLORS; n2++)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	119 {
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	120 const DMColor *col2 = &cpal->colors[n2];
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	121 img->pal->colors[n].r = (col1->r + col2->r) / 2;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	122 img->pal->colors[n].g = (col1->g + col2->g) / 2;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	123 img->pal->colors[n].b = (col1->b + col2->b) / 2;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	124 n++;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	125 }
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	126 }
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	127 }
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	128 else
1732 07111a60cd4e Add dmSetMixedColorC64Palette() for setting a 256 entry "mixed color" Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	129 {
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	130 // Standard palette, just copy it
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	131 if ((res = dmPaletteAlloc(&(img->pal), D64_NCOLORS, 255)) != DMERR_OK)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	132 return res;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	133
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	134 memcpy(img->pal->colors, cpal->colors, img->pal->ncolors * sizeof(DMColor));
1732 07111a60cd4e Add dmSetMixedColorC64Palette() for setting a 256 entry "mixed color" Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	135 }
07111a60cd4e Add dmSetMixedColorC64Palette() for setting a 256 entry "mixed color" Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	136
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2061 diff changeset	137 return DMERR_OK;
1732 07111a60cd4e Add dmSetMixedColorC64Palette() for setting a 256 entry "mixed color" Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	138 }
07111a60cd4e Add dmSetMixedColorC64Palette() for setting a 256 entry "mixed color" Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	139
07111a60cd4e Add dmSetMixedColorC64Palette() for setting a 256 entry "mixed color" Matti Hamalainen <ccr@tnsp.org> parents: 1731 diff changeset	140
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	141 BOOL dmCompareAddr16(const DMGrowBuf *buf, const size_t offs, const Uint16 addr)
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	142 {
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	143 return
5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	144 offs + 1 < buf->len &&
1923 42cd527a01b9 Remove mostly unused DM_GET_ADDR_{LO,HI} macros. Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	145 buf->data[offs ] == (addr & 0xff) &&
42cd527a01b9 Remove mostly unused DM_GET_ADDR_{LO,HI} macros. Matti Hamalainen <ccr@tnsp.org> parents: 1922 diff changeset	146 buf->data[offs + 1] == ((addr >> 8) & 0xff);
1381 b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	147 }
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	148
b6782b785457 Move things around a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1380 diff changeset	149
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	150 int dmC64ImageGetNumBlocks(const DMC64ImageFormat *fmt)
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	151 {
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	152 int nblocks = 0;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	153 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	154 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	155 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	156 if (op->type == DO_LAST)
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	157 break;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	158
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	159 if (op->bank > nblocks)
8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	160 nblocks = op->bank;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	161 }
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	162
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	163 return nblocks + 1;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	164 }
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	165
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	166
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	167 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	168 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	169 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	170 return DMERR_MALLOC;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	171
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	172 blk->size = size;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	173 return DMERR_OK;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	174 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	175
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	176
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	177 int dmC64MemBlockReAlloc(DMC64MemBlock *blk, const size_t size)
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	178 {
1851 cfc7046fb176 Reallocate buffer only if the new size is larger in dmC64MemBlockReAlloc(). Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	179 // Reallocate only if new size is larger
cfc7046fb176 Reallocate buffer only if the new size is larger in dmC64MemBlockReAlloc(). Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	180 if (size <= blk->size)
cfc7046fb176 Reallocate buffer only if the new size is larger in dmC64MemBlockReAlloc(). Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	181 return DMERR_OK;
cfc7046fb176 Reallocate buffer only if the new size is larger in dmC64MemBlockReAlloc(). Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	182
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	183 if ((blk->data = dmRealloc(blk->data, size)) == NULL)
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	184 return DMERR_MALLOC;
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	185
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	186 dmMemset(blk->data + blk->size, 0, size - blk->size);
1851 cfc7046fb176 Reallocate buffer only if the new size is larger in dmC64MemBlockReAlloc(). Matti Hamalainen <ccr@tnsp.org> parents: 1846 diff changeset	187
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	188 blk->size = size;
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	189 return DMERR_OK;
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	190 }
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	191
88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	192
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	193 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	194 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	195 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	196 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	197 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	198 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	199 return DMERR_MALLOC;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	200
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	201 memcpy(dst->data, src->data, src->size);
1824 adf9f05c26e1 Improve error handling of dmC64MemBlockCopy(). Matti Hamalainen <ccr@tnsp.org> parents: 1822 diff changeset	202 return DMERR_OK;
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	203 }
1824 adf9f05c26e1 Improve error handling of dmC64MemBlockCopy(). Matti Hamalainen <ccr@tnsp.org> parents: 1822 diff changeset	204 else
adf9f05c26e1 Improve error handling of dmC64MemBlockCopy(). Matti Hamalainen <ccr@tnsp.org> parents: 1822 diff changeset	205 return DMERR_INVALID_DATA;
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	206 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	207
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	208
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	209 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	210 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	211 if (blk != NULL)
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	212 {
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	213 dmFreeR(&blk->data);
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	214 blk->size = 0;
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	215 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	216 }
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	217
ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	218
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	219 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	220 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	221 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	222
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	223 if (img == NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	224 return NULL;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	225
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	226 // Initialize image information
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1944 diff changeset	227 img->fmt = fmt->format;
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	228 img->nblocks = dmC64ImageGetNumBlocks(fmt);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	229
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	230 // Allocate banks
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	231 if ((img->color = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL \|\|
8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	232 (img->bitmap = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL \|\|
8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	233 (img->screen = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL \|\|
8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	234 (img->charData = dmCalloc(img->nblocks, sizeof(DMC64MemBlock))) == NULL)
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	235 goto err;
c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	236
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	237 return img;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	238
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	239 err:
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	240 dmC64ImageFree(img);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	241 return NULL;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	242 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	243
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	244
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	245 void dmC64ImageFree(DMC64Image *img)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	246 {
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	247 if (img != NULL)
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	248 {
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	249 // Free the allocated areas
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	250 for (int i = 0; i < img->nblocks; i++)
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	251 {
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	252 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	253 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	254 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	255 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	256 }
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	257
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	258 // 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	259 dmFree(img->color);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	260 dmFree(img->bitmap);
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	261 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	262 dmFree(img->charData);
1462 9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	263
9cb6dd1046bf Fix memory leaks by freeing more things in dmC64ImageFree(). Matti Hamalainen <ccr@tnsp.org> parents: 1461 diff changeset	264 // Extra data ..
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2122 diff changeset	265 for (int i = 0; i < D64_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	266 dmC64MemBlockFree(&img->extraData[i]);
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	267
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	268 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	269 dmFree(img);
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	270 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	271 }
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	272
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	273
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	274 int dmC64ConvertCSDataToImage(DMImage *img,
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	275 int xoffs, int yoffs, const Uint8 *buf,
915 ba6b210c9bf4 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 912 diff changeset	276 int width, int height, BOOL multicolor,
ba6b210c9bf4 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 912 diff changeset	277 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	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 int yc, widthpx = width * 8;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	280 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	281
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 if (img == NULL)
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	283 return DMERR_NULLPTR;
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	284
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	285 if (xoffs < 0 \|\| yoffs < 0 \|\|
e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	286 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	287 yoffs > img->height - height)
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	288 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	289
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 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	291
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 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	293 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 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	295 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 const int offs = yc * width;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	297 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	298
1875 b052754a1a23 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1858 diff changeset	299 for (int xc = 0; xc < widthpx / 2; xc++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 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	302 const int v = 6 - ((xc * 2) & 6);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	303 const Uint8 c = colors[(b >> v) & 3];
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	304
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 *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	306 *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	307 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 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	310 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 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	315 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 const int offs = yc * width;
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	317 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	318
1875 b052754a1a23 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1858 diff changeset	319 for (int xc = 0; xc < widthpx; xc++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 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	322 const int v = 7 - (xc & 7);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	323 const Uint8 c = colors[(b >> v) & 1];
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	324
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 *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	326 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 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	329 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 }
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	331
517 e2a76bb59888 Return better error values, using DMERR_* enums. Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	332 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	333 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	336 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	337 {
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	338 #define DM_STAT_MAX 256
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	339 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	340
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	341 // Allocate statistics counts buffer
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	342 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	343 return;
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	344
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	345 // 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	346 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	347 stats[buf->data[offs]]++;
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	348
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	349 // 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	350 switch (cfg->type)
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	351 {
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	352 case DM_COMP_RLE_MARKER:
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	353 {
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	354 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	355 smallest = buf->len;
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	356
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	357 // 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	358 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	359 {
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	360 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	361 {
1821 ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	362 switch (cfg->flags & DM_RLE_RUNS_MASK)
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	363 {
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	364 case DM_RLE_BYTE_RUNS \| DM_RLE_WORD_RUNS:
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	365 cfg->rleMarkerW = selected;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	366 cfg->rleMarkerB = selected = n;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	367 break;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	368
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	369 case DM_RLE_BYTE_RUNS:
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	370 cfg->rleMarkerB = selected = n;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	371 break;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	372
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	373 case DM_RLE_WORD_RUNS:
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	374 cfg->rleMarkerW = selected = n;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	375 break;
ee2383d1a21e Improve dmGenericRLEAnalyze() by being better at selecting rleMarker bytes Matti Hamalainen <ccr@tnsp.org> parents: 1820 diff changeset	376 }
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	377 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	378 }
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	379 }
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	380 }
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	381 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	382
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	383 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	384 cfg->rleMarkerMask = 0xC0;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	385 cfg->rleMarkerBits = 0xC0;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	386 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	387 break;
1542 69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	388 }
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	389
69fa95707e65 Implement dmGenericRLEAnalyze() and use it where appropriate. Matti Hamalainen <ccr@tnsp.org> parents: 1537 diff changeset	390 dmFree(stats);
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	391 }
c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	392
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	393
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	394 //#define RLE_DEBUG
1503 c7b9ef56319b Factor all the c64 file format specific things into lib64fmt.c Matti Hamalainen <ccr@tnsp.org> parents: 1501 diff changeset	395
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	396 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	397 {
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	398 if (src != NULL && (cfg->flags & DM_RLE_BACKWARDS_INPUT))
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	399 {
1831 ce1a734b016f Change the logic of how DMGrowBuf works in "backwards" growing mode. Adjust Matti Hamalainen <ccr@tnsp.org> parents: 1828 diff changeset	400 src->offs = src->len;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	401 src->backwards = TRUE;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	402 }
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	403
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	404 if (dst != NULL && (cfg->flags & DM_RLE_BACKWARDS_OUTPUT))
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	405 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	406 dst->backwards = TRUE;
1831 ce1a734b016f Change the logic of how DMGrowBuf works in "backwards" growing mode. Adjust Matti Hamalainen <ccr@tnsp.org> parents: 1828 diff changeset	407 dst->offs = dst->size;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	408 }
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	409
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	410 #ifdef RLE_DEBUG
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	411 fprintf(stderr, "dmSetupRLEBuffers:\n");
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	412 if (src != NULL)
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	413 fprintf(stderr, " src.len=%" DM_PRIx_SIZE_T ", src.size=%" DM_PRIx_SIZE_T ", src.offs=%" DM_PRIx_SIZE_T "\n", src->len, src->size, src->offs);
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	414 if (dst != NULL)
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	415 fprintf(stderr, " dst.len=%" DM_PRIx_SIZE_T ", dst.size=%" DM_PRIx_SIZE_T ", dst.offs=%" DM_PRIx_SIZE_T "\n", dst->len, dst->size, dst->offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	416 fprintf(stderr, "------------------\n");
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	417 #endif
1718 bed88d17f28c Fix a commit blunder here .. Matti Hamalainen <ccr@tnsp.org> parents: 1717 diff changeset	418 }
bed88d17f28c Fix a commit blunder here .. Matti Hamalainen <ccr@tnsp.org> parents: 1717 diff changeset	419
bed88d17f28c Fix a commit blunder here .. Matti Hamalainen <ccr@tnsp.org> parents: 1717 diff changeset	420
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	421 void dmFinishRLEBuffers(DMGrowBuf dst, DMGrowBuf src, const DMCompParams *cfg)
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	422 {
1741 6f1313c761aa Actually fix the warnings .. sigh. Matti Hamalainen <ccr@tnsp.org> parents: 1740 diff changeset	423 (void) src;
6f1313c761aa Actually fix the warnings .. sigh. Matti Hamalainen <ccr@tnsp.org> parents: 1740 diff changeset	424
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	425 #ifdef RLE_DEBUG
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	426 fprintf(stderr, "------------------\n");
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	427 fprintf(stderr, "dmFinishRLEBuffers:\n");
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	428 if (src != NULL)
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	429 fprintf(stderr, " src.len=%" DM_PRIx_SIZE_T ", src.size=%" DM_PRIx_SIZE_T ", src.offs=%" DM_PRIx_SIZE_T "\n", src->len, src->size, src->offs);
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	430 if (dst != NULL)
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	431 fprintf(stderr, " dst.len=%" DM_PRIx_SIZE_T ", dst.size=%" DM_PRIx_SIZE_T ", dst.offs=%" DM_PRIx_SIZE_T "\n", dst->len, dst->size, dst->offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	432 #endif
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	433
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	434 if (dst != NULL)
1720 77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	435 {
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	436 if (cfg->flags & DM_RLE_BACKWARDS_OUTPUT)
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	437 {
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	438 memmove(dst->data, dst->data + dst->offs, dst->len);
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	439 dst->offs = 0;
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	440 }
1720 77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	441
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	442 switch (cfg->flags & DM_OUT_CROP_MASK)
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	443 {
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	444 case DM_OUT_CROP_END:
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	445 if (cfg->cropOutLen < dst->len)
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	446 {
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	447 memmove(dst->data, dst->data + dst->len - cfg->cropOutLen, cfg->cropOutLen);
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	448 dst->len = cfg->cropOutLen;
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	449 }
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	450 break;
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	451
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	452 case DM_OUT_CROP_START:
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	453 if (cfg->cropOutLen <= dst->len)
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	454 dst->len = cfg->cropOutLen;
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	455 break;
b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	456 }
1720 77a4d8fab5cc Add output buffer cropping to dmFinishRLEBuffers() and the flags and fields to DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1718 diff changeset	457 }
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	458
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	459 #ifdef RLE_DEBUG
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	460 fprintf(stderr, "ADJUSTED:\n");
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	461 if (src != NULL)
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	462 fprintf(stderr, " src.len=%" DM_PRIx_SIZE_T ", src.size=%" DM_PRIx_SIZE_T ", src.offs=%" DM_PRIx_SIZE_T "\n", src->len, src->size, src->offs);
2140 b8491ee3cf24 Allow NULL buffer argument(s) for dmSetupRLEBuffers() and dmFinishRLEBuffers(). Matti Hamalainen <ccr@tnsp.org> parents: 2132 diff changeset	463 if (dst != NULL)
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	464 fprintf(stderr, " dst.len=%" DM_PRIx_SIZE_T ", dst.size=%" DM_PRIx_SIZE_T ", dst.offs=%" DM_PRIx_SIZE_T "\n", dst->len, dst->size, dst->offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	465 #endif
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	466 }
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	467
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	468
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	469 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	470 {
1944 d9a0a4bccf5d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1933 diff changeset	471 for (unsigned int scount = count; scount; scount--)
1713 0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	472 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	473 if (!dmGrowBufPutU8(dst, data))
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	474 {
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	475 return dmError(DMERR_MALLOC,
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	476 "%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	477 "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	478 cfg->func, count, data, dst->offs, dst->size);
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	479 }
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	480 }
0a9110b4d036 Add few RLE helper functions. Matti Hamalainen <ccr@tnsp.org> parents: 1710 diff changeset	481 return DMERR_OK;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	482 }
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	483
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	484
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	485 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	486 {
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	487 int res;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	488 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	489 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	490
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	491 // 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	492 // 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	493 dmGrowBufConstCopy(&src, psrc);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	494 dmSetupRLEBuffers(dst, &src, cfg);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	495
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	496 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	497 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	498 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	499
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	500 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	501 {
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	502 // A simple marker byte RLE variant: [Marker] [count] [data]
1744 e40227e994e2 Fix unitialized data accesses. Matti Hamalainen <ccr@tnsp.org> parents: 1741 diff changeset	503 if ((cfg->flags & DM_RLE_BYTE_RUNS) && data == cfg->rleMarkerB)
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	504 {
1750 b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	505 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	506 {
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	507 #ifdef RLE_DEBUG
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	508 fprintf(stderr, " marker=$%02x\n", cfg->rleMarkerB);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	509 fprintf(stderr, " src.len=%" DM_PRIx_SIZE_T ", src.size=%" DM_PRIx_SIZE_T ", src.offs=%" DM_PRIx_SIZE_T "\n", src.len, src.size, src.offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	510 fprintf(stderr, " dst.len=%" DM_PRIx_SIZE_T ", dst.size=%" DM_PRIx_SIZE_T ", dst.offs=%" DM_PRIx_SIZE_T "\n", dst->len, dst->size, dst->offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	511 #endif
1727 8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	512 res = dmError(DMERR_INVALID_DATA,
1750 b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	513 "%s: RLE: Invalid data/out of data for byte length run sequence (1).\n",
b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	514 cfg->func);
b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	515 goto out;
b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	516 }
b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	517 if (!dmGrowBufGetU8(&src, &tmp2))
b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	518 {
2061 221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	519 #ifdef RLE_DEBUG
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	520 fprintf(stderr, " marker=$%02x, data=$%02x\n", cfg->rleMarkerB, tmp1);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	521 fprintf(stderr, " src.len=%" DM_PRIx_SIZE_T ", src.size=%" DM_PRIx_SIZE_T ", src.offs=%" DM_PRIx_SIZE_T "\n", src.len, src.size, src.offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	522 fprintf(stderr, " dst.len=%" DM_PRIx_SIZE_T ", dst.size=%" DM_PRIx_SIZE_T ", dst.offs=%" DM_PRIx_SIZE_T "\n", dst->len, dst->size, dst->offs);
221a95caa91e Add some #ifdef'd out RLE (de)compression debug prints. Matti Hamalainen <ccr@tnsp.org> parents: 1984 diff changeset	523 #endif
1750 b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	524 res = dmError(DMERR_INVALID_DATA,
b9f3c1796fba More granular error handling in RLE decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	525 "%s: RLE: Invalid data/out of data for byte length run sequence (2).\n",
1727 8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	526 cfg->func);
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	527 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	528 }
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	529 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	530 {
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	531 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	532 count = tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	533 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	534 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	535
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	536 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	537 data = tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	538 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	539 break;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	540 }
1783 1ce808599129 Add DM_RLE_ZERO_COUNT_MAX flag for RLE decoder which makes it interpret run Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	541
1ce808599129 Add DM_RLE_ZERO_COUNT_MAX flag for RLE decoder which makes it interpret run Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	542 if (count == 0 && (cfg->flags & DM_RLE_ZERO_COUNT_MAX))
1ce808599129 Add DM_RLE_ZERO_COUNT_MAX flag for RLE decoder which makes it interpret run Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	543 count = 256;
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	544 }
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	545 else
1744 e40227e994e2 Fix unitialized data accesses. Matti Hamalainen <ccr@tnsp.org> parents: 1741 diff changeset	546 if ((cfg->flags & DM_RLE_WORD_RUNS) && data == cfg->rleMarkerW)
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	547 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	548 if (!dmGrowBufGetU8(&src, &tmp1) \|\|
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	549 !dmGrowBufGetU8(&src, &tmp2) \|\|
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	550 !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	551 {
1727 8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	552 res = dmError(DMERR_INVALID_DATA,
8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	553 "%s: RLE: Invalid data/out of data for word length run sequence.\n",
8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	554 cfg->func);
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	555 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	556 }
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	557 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	558 {
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	559 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	560 count = (tmp2 << 8) \| tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	561 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	562 break;
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	563
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	564 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	565 data = tmp1;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	566 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	567 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	568 }
1783 1ce808599129 Add DM_RLE_ZERO_COUNT_MAX flag for RLE decoder which makes it interpret run Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	569
1ce808599129 Add DM_RLE_ZERO_COUNT_MAX flag for RLE decoder which makes it interpret run Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	570 if (count == 0 && (cfg->flags & DM_RLE_ZERO_COUNT_MAX))
1ce808599129 Add DM_RLE_ZERO_COUNT_MAX flag for RLE decoder which makes it interpret run Matti Hamalainen <ccr@tnsp.org> parents: 1780 diff changeset	571 count = 65536;
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	572 }
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	573 }
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	574 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	575 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	576 {
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	577 // 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	578 // 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	579 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	580 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	581 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	582 {
1727 8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	583 res = dmError(DMERR_INVALID_DATA,
8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	584 "%s: RLE: Invalid data/out of data for byte length mask/run sequence.\n",
8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	585 cfg->func);
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	586 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	587 }
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	588
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	589 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	590 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	591 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 }
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	593
1715 c0c6fd8b288a Use dmGenericRLEOutputRun(). Matti Hamalainen <ccr@tnsp.org> parents: 1713 diff changeset	594 if ((res = dmGenericRLEOutputRun(dst, cfg, data, count)) != DMERR_OK)
c0c6fd8b288a Use dmGenericRLEOutputRun(). Matti Hamalainen <ccr@tnsp.org> parents: 1713 diff changeset	595 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	596 }
523 d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	597
1717 7de37c01dbd4 Use dmFinishRLEBuffers() in dmDecodeGenericRLE() Matti Hamalainen <ccr@tnsp.org> parents: 1716 diff changeset	598 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	599 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	600
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	601 out:
1463 bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	602 return res;
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	603 }
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	604
bde6a66bc2f6 Change dmDecodeGenericRLE() to use DMGrowBuf as output. Also add support Matti Hamalainen <ccr@tnsp.org> parents: 1462 diff changeset	605
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	606 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	607 {
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	608 int res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	609 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	610 return res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	611
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	612 return dmDecodeGenericRLE(dst, src, cfg);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	613 }
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
1820 bea67833b9fa Oops, need to deconstify the "count" argument of dmEncodeGenericRLESequence() as we now modify it inside. Matti Hamalainen <ccr@tnsp.org> parents: 1818 diff changeset	616 int dmEncodeGenericRLESequence(DMGrowBuf dst, const Uint8 data, unsigned int count, const DMCompParams cfg)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	617 {
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	618 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	619 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	620
3265175b24d2 Change the passing of RLE compression/decompression parameters to be in a dedicated struct. Matti Hamalainen <ccr@tnsp.org> parents: 1503 diff changeset	621 switch (cfg->type)
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	622 {
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	623 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	624 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	625 (count >= cfg->rleMinCountW \|\| data == cfg->rleMarkerW))
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	626 {
1818 7bafe5f0998d Implement DM_RLE_ZERO_COUNT_MAX support in the generic RLE compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	627 if (count == 65536 && (cfg->flags & DM_RLE_ZERO_COUNT_MAX))
7bafe5f0998d Implement DM_RLE_ZERO_COUNT_MAX support in the generic RLE compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	628 count = 0;
7bafe5f0998d Implement DM_RLE_ZERO_COUNT_MAX support in the generic RLE compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	629
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	630 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	631 goto err;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	632
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	633 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	634 {
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	635 case DM_RLE_ORDER_1:
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	636 if (!dmGrowBufPutU16LE(dst, count) \|\|
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	637 !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	638 goto err;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	639 break;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	640
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	641 case DM_RLE_ORDER_2:
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	642 if (!dmGrowBufPutU8(dst, data) \|\|
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	643 !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	644 goto err;
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	645 break;
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	646 }
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	647 }
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	648 else
7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	649 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	650 (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	651 {
1818 7bafe5f0998d Implement DM_RLE_ZERO_COUNT_MAX support in the generic RLE compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	652 if (count == 256 && (cfg->flags & DM_RLE_ZERO_COUNT_MAX))
7bafe5f0998d Implement DM_RLE_ZERO_COUNT_MAX support in the generic RLE compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	653 count = 0;
7bafe5f0998d Implement DM_RLE_ZERO_COUNT_MAX support in the generic RLE compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1814 diff changeset	654
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	655 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	656 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	657
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	658 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	659 {
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	660 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	661 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	662 !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	663 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	664 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	665
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	666 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	667 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	668 !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	669 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	670 break;
86373ac0861a Implement another RLE variant, with different ordering of marker, count and data bytes. Matti Hamalainen <ccr@tnsp.org> parents: 1548 diff changeset	671 }
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	672 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	673 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	674 copyOnly = TRUE;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	675 break;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	676
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	677 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	678 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	679 {
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	680 // 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	681 // 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	682 if (!dmGrowBufPutU8(dst, cfg->rleMarkerBits \| count) \|\|
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	683 !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	684 goto err;
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	685 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	686 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	687 copyOnly = TRUE;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	688 break;
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	689 }
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	690
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	691 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	692 return res;
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	693
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	694 return DMERR_OK;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	695
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	696 err:
9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	697 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	698 "%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	699 cfg->func, count, data);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	700 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	701
1466 bc75be0546fc More work on RLE decoder/encoder changes. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	702
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	703 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	704 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	705 DMGrowBuf src;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	706 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	707 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	708 Uint8 data;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	709
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	710 // 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	711 // 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	712 dmGrowBufConstCopy(&src, psrc);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	713 dmSetupRLEBuffers(dst, &src, cfg);
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	714
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	715 while (dmGrowBufGetU8(&src, &data))
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	716 {
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	717 // 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	718 // for the active runs mode(s) .. then encode the run.
1833 19d4f76e003d Improve RLE compression by checking for "first byte" condition in the compressor. Matti Hamalainen <ccr@tnsp.org> parents: 1831 diff changeset	719 if ((data != prev && prev != -1) \|\|
1660 7555c8803529 More work on improving the generic RLE decoder/encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1650 diff changeset	720 ((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	721 (((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	722 {
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	723 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	724 goto err;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	725
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	726 count = 1;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	727 }
1496 5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	728 else
5c46004dad15 Work on the RLE encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1494 diff changeset	729 count++;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	730
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	731 prev = data;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	732 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	733
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	734 // 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	735 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	736 goto err;
24b8b452925e Improve error handling of RLE encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1513 diff changeset	737
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	738 dmFinishRLEBuffers(dst, &src, cfg);
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	739
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	740 err:
1716 9731b0bdec64 Improve error handling of dmEncodeGenericRLESequence() and use dmGenericRLEOutputRun() here as well. Matti Hamalainen <ccr@tnsp.org> parents: 1715 diff changeset	741 return res;
1478 d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	742 }
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	743
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	744
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	745 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	746 {
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	747 int res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	748 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	749 return res;
d883b4c1cf48 More work on RLE encoding/decoding. Matti Hamalainen <ccr@tnsp.org> parents: 1476 diff changeset	750
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	751 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	752 }
d0c0c6baeb57 Split the RLE decoding from DrazPaint/Lace and Amica paint decoders to a Matti Hamalainen <ccr@tnsp.org> parents: 519 diff changeset	753
519 feaaf0e2ecbe Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 518 diff changeset	754
1537 776aa43b2c57 Tiny improvement in MC->FLI upconversion. Matti Hamalainen <ccr@tnsp.org> parents: 1534 diff changeset	755 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	756 {
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	757 if (op->flags == 0)
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	758 {
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	759 return dmError(DMERR_INTERNAL,
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	760 "Invalid operation flags value %d in generic encode/decode operator %d @ #%d.\n",
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	761 op->flags, op->type, i);
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	762 }
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	763
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	764 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	765 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	766 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	767 case DO_SET_MEM:
1726 f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	768 case DO_SET_MEM_HI:
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	769 case DO_SET_MEM_LO:
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	770 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	771 switch (op->subject)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	772 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	773 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	774 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	775 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	776 case DS_CHAR_DATA:
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	777 if (op->bank < 0 \|\| op->bank > img->nblocks)
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	778 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	779 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	780 "Invalid bank %d / %d definition in generic encode/decode operator %d @ #%d.\n",
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	781 op->bank, img->nblocks, op->type, i);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	782 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	783 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	784
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	785 case DS_EXTRA_DATA:
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2122 diff changeset	786 if (op->bank < 0 \|\| op->bank >= D64_MAX_EXTRA_DATA)
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	787 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	788 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	789 "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	790 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	791 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	792 break;
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	793 }
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	794 break;
fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	795
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	796 // Just list the allowed ops here
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1919 diff changeset	797 case DO_FUNC:
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	798 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	799 case DO_LAST:
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	800 break;
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	801
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	802 default:
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	803 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	804 "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	805 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	806 break;
510 43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	807 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	808
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	809 return DMERR_OK;
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	810 }
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	811
43ea59887c69 Start work on making C64 formats encoding possible by changing DMDecodeOps Matti Hamalainen <ccr@tnsp.org> parents: 508 diff changeset	812
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	813 size_t dmC64GetSubjectSize(const int subject, const DMC64ImageCommonFormat *fmt)
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	814 {
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	815 switch (subject)
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	816 {
1725 40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	817 case DS_SCREEN_RAM:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	818 case DS_COLOR_RAM:
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	819 return fmt->chHeight * fmt->chWidth;
1725 40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	820
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	821 case DS_BITMAP_RAM:
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	822 return fmt->chHeight * fmt->chWidth * 8;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	823
1725 40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	824 case DS_CHAR_DATA:
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2122 diff changeset	825 return D64_MAX_CHARS * D64_CHR_SIZE;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	826
1725 40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	827 case DS_D020:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	828 case DS_BGCOL:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	829 case DS_D021:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	830 case DS_D022:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	831 case DS_D023:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	832 case DS_D024:
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	833 return 1;
1725 40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	834
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	835 default:
40a5ba0b3838 Return size of subject in dmC64GetOpSize() despite what the operator type is. Matti Hamalainen <ccr@tnsp.org> parents: 1722 diff changeset	836 // Default to size of 0
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	837 return 0;
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	838 }
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	839 }
34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	840
34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	841
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	842 size_t dmC64GetOpSubjectSize(const DMC64EncDecOp op, const DMC64ImageCommonFormat fmt)
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	843 {
34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	844 size_t size = dmC64GetSubjectSize(op->subject, fmt);
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	845
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	846 // If the operator specified size is larger, use it.
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	847 if (op->size > size)
34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	848 size = op->size;
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	849
1916 34ba8e2d2dd7 Split dmC64GetOpSize() to dmC64GetSubjectSize() and dmC64GetOpSubjectSize(). Matti Hamalainen <ccr@tnsp.org> parents: 1875 diff changeset	850 return size;
927 db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	851 }
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	852
db495f421242 Change dmC64DefaultSizes[] array into a function instead. Matti Hamalainen <ccr@tnsp.org> parents: 925 diff changeset	853
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	854 const char *dmC64GetOpSubjectName(const int subject)
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	855 {
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	856 static const char *subjectNames[DS_LAST] =
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	857 {
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	858 "Color RAM",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	859 "Bitmap RAM",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	860 "Screen RAM",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	861 "Extra data",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	862 "Character data",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	863
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	864 "d020",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	865 "d021/bgcol",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	866 "d022",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	867 "d023",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	868 "d024",
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	869 };
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	870 if (subject >= 0 && subject < DS_LAST)
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	871 return subjectNames[subject];
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	872 else
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	873 return NULL;
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	874 }
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	875
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	876
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	877 const char *dmC64GetOpType(const int type)
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	878 {
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	879 static const char *typeNames[DO_LAST] =
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	880 {
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	881 "COPY",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	882 "SET_MEM",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	883 "SET_OP",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	884 "SET_MEM_HI",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	885 "SET_MEM_LO",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	886
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	887 "FUNC",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	888 "CHAR_CFG",
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	889 };
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	890 if (type >= 0 && type < DO_LAST)
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	891 return typeNames[type];
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	892 else
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	893 return "ERROR";
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	894 }
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	895
a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	896
2108 5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	897 const DMC64MemBlock * dmC64GetOpMemBlock(const DMC64Image *img, const int subject, const int bank)
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	898 {
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	899 if (bank >= 0 && bank < img->nblocks)
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	900 {
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	901 switch (subject)
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	902 {
2108 5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	903 case DS_COLOR_RAM : return &img->color[bank];
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	904 case DS_SCREEN_RAM : return &img->screen[bank];
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	905 case DS_BITMAP_RAM : return &img->bitmap[bank];
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	906 case DS_CHAR_DATA : return &img->charData[bank];
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	907 case DS_EXTRA_DATA : return &img->extraData[bank];
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	908 }
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	909 }
2108 5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	910
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	911 return NULL;
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	912 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	913
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	914
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	915 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	916 {
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	917 int res = DMERR_OK;
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	918
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	919 if (buf == NULL \|\| buf->data == NULL \|\| img == NULL \|\| fmt == NULL)
513 486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	920 return DMERR_NULLPTR;
486067f39bc1 Add sanity checking. Matti Hamalainen <ccr@tnsp.org> parents: 511 diff changeset	921
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	922 // Clear the image structure, set basics
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	923 img->nblocks = dmC64ImageGetNumBlocks(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	924
518 63849f85db57 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 517 diff changeset	925 // Perform decoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	926 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	927 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	928 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
410 e4b2f689aff6 Stdint -> SDL types conversion. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	929 const Uint8 *src;
1600 e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	930 DMC64MemBlock *blk = NULL;
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	931 const char *subjname = dmC64GetOpSubjectName(op->subject);
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 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	933 Uint8 value;
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	934
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	935 // 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	936 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	937 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	938
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	939 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	940 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	941 return res;
925 23b14d62bf67 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 924 diff changeset	942
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	943 // Check flags
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	944 if ((op->flags & DF_DECODE) == 0)
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	945 continue;
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	946
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	947 // Is the operation inside the bounds?
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	948 size = dmC64GetOpSubjectSize(op, fmt->format);
1858 1816211341a0 Only check operator size for DO_COPY operators against source size. Matti Hamalainen <ccr@tnsp.org> parents: 1853 diff changeset	949 if (op->type == DO_COPY && 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	950 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	951 return dmError(DMERR_INVALID_DATA,
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	952 "Decode SRC out of bounds, op #%d type=%s, subj=%s, 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	953 "bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	954 i, dmC64GetOpType(op->type), subjname, op->offs, op->offs, op->bank,
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	955 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	956 }
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	957
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	958 src = buf->data + op->offs;
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	959
aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	960 // 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	961 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	962 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	963 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	964 case DO_SET_MEM:
1726 f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	965 case DO_SET_MEM_HI:
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	966 case DO_SET_MEM_LO:
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	967 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	968 switch (op->subject)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	969 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	970 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	971 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	972 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	973 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	974 case DS_EXTRA_DATA:
2108 5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	975 // XXX BZZZT .. a nasty cast here
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	976 blk = (DMC64MemBlock *) dmC64GetOpMemBlock(img, op->subject, op->bank);
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1851 diff changeset	977
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	978 if ((dmC64MemBlockReAlloc(blk, op->offs2 + size)) != DMERR_OK)
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	979 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	980 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	981 "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	982 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	983 subjname, i, op->offs, op->offs, op->bank, op->offs2 + size, op->offs2 + 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	984 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	985 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	986 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	987 case DO_COPY:
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	988 memcpy(blk->data + op->offs2, src, size);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	989 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	990
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	991 case DO_SET_MEM:
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	992 dmMemset(blk->data + op->offs2, *src, size);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	993 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	994
1925 cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	995 case DO_SET_MEM_HI:
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	996 dmMemset(blk->data + op->offs2, (*src >> 4) & 0x0f, size);
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	997 break;
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	998
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	999 case DO_SET_MEM_LO:
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	1000 dmMemset(blk->data + op->offs2, *src & 0x0f, size);
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	1001 break;
cf0457f93b37 Add support for DO_SET_MEM_LO and DO_SET_MEM_HI for blocks in dmC64DecodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1924 diff changeset	1002
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1003 case DO_SET_OP:
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	1004 dmMemset(blk->data + op->offs2, op->offs, size);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1005 break;
1727 8eb5ff34864a Improve error messages in the RLE decoder. Matti Hamalainen <ccr@tnsp.org> parents: 1726 diff changeset	1006
1721 c9a6f1dae756 Add one default case error handler. Matti Hamalainen <ccr@tnsp.org> parents: 1720 diff changeset	1007 default:
c9a6f1dae756 Add one default case error handler. Matti Hamalainen <ccr@tnsp.org> parents: 1720 diff changeset	1008 return dmError(DMERR_INTERNAL,
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1009 "Unhandled op type %s in "
1721 c9a6f1dae756 Add one default case error handler. Matti Hamalainen <ccr@tnsp.org> parents: 1720 diff changeset	1010 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1011 dmC64GetOpType(op->type), 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	1012 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1013 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1014
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1015 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	1016 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	1017 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	1018 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	1019 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	1020 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	1021 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	1022 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1023 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	1024 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	1025 value = *src;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1026 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1027
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1028 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	1029 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	1030 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1031
1726 f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1032 case DO_SET_MEM_HI:
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1033 value = (*src >> 4) & 0x0f;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1034 break;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1035
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1036 case DO_SET_MEM_LO:
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1037 value = *src & 0x0f;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1038 break;
1924 1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1039
1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1040 default:
1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1041 return dmError(DMERR_INTERNAL,
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1042 "Unhandled op type %s in "
1924 1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1043 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1044 dmC64GetOpType(op->type), 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	1045 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1046 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	1047 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1048 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	1049 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	1050 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	1051 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	1052 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	1053 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	1054 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1055 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1056
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1057 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1058 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	1059 "Unhandled subject %d in "
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1060 "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	1061 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	1062 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1063 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1064
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1065 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	1066 switch (op->subject)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1067 {
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1068 case D64_CHCFG_SCREEN:
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1069 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1070
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1071 case D64_CHCFG_LINEAR:
2179 8d53da5bf067 Rename DMC64Image::nbanks to nblocks, which reflects better what it does. Matti Hamalainen <ccr@tnsp.org> parents: 2175 diff changeset	1072 for (int bank = 0; bank < img->nblocks; bank++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1073 {
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1074 for (int offs = 0; offs < fmt->format->chHeight * fmt->format->chWidth; offs++)
1588 ca087c0cc9c4 Refactor the c64 format memory handling a bit for more flexibility. Matti Hamalainen <ccr@tnsp.org> parents: 1586 diff changeset	1075 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	1076 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1077 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1078
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1079 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1080 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	1081 "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	1082 "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	1083 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	1084 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1085 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1086
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1919 diff changeset	1087 case DO_FUNC:
3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1919 diff changeset	1088 if (op->decFunction != NULL &&
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1089 (res = op->decFunction(op, img, buf, fmt->format)) != 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	1090 {
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1091 return dmError(res,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1092 "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	1093 "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	1094 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	1095 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1096 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1097 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1098 }
916 3985f596ece5 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 915 diff changeset	1099
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	1100 // Sanity check certain things ..
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1101 if ((fmt->format->type & D64_FMT_ILACE) && img->laceType == D64_ILACE_NONE)
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	1102 {
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	1103 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	1104 "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	1105 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	1106 }
948d6fda722d Add sanity check for interlaced formats: check that the interlace type flags are set. Matti Hamalainen <ccr@tnsp.org> parents: 1645 diff changeset	1107
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	1108 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	1109 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1110
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1111
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1112 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	1113 {
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1114 int res = DMERR_OK;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1115
1469 0046b4e1b35f Various fixes in bmp encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1467 diff changeset	1116 if (img == NULL \|\| fmt == NULL)
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1117 return DMERR_NULLPTR;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1118
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1119 // Allocate the output buffer if requested
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1120 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	1121 {
1472 b9d3577d8290 Improve error handling and checking. Matti Hamalainen <ccr@tnsp.org> parents: 1471 diff changeset	1122 dmError(res,
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1123 "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	1124 fmt->size);
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1125 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1126 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1127
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1128 if (buf->backwards)
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1129 {
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1130 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	1131 "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	1132 goto err;
1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1133 }
1506 4fd4e7a00db4 Fix handling of predefined DMGrowBuffer in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1505 diff changeset	1134
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1135 // Perform encoding
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1136 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	1137 {
1591 3cc7b2aadda3 Add inline helper function fmtGetEncDecOp() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1588 diff changeset	1138 const DMC64EncDecOp *op = fmtGetEncDecOp(fmt, i);
1364 0d61895e1763 Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1362 diff changeset	1139 size_t size, chksize;
1600 e28e67358ff6 Fix some uninitialized variable warnings. Matti Hamalainen <ccr@tnsp.org> parents: 1597 diff changeset	1140 const DMC64MemBlock *blk = NULL;
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1141 const char *subjname = dmC64GetOpSubjectName(op->subject);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1142 Uint8 value;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1143
1365 60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1144 // 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	1145 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	1146 break;
60d7240e1a63 Remove hardcoded encoding/decoding operator counts from the structures, use Matti Hamalainen <ccr@tnsp.org> parents: 1364 diff changeset	1147
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1148 // Check operation validity
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1149 if ((res = dmC64SanityCheckEncDecOp(i, op, img)) != DMERR_OK)
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1150 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1151
2196 28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	1152 // Check flags
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	1153 if ((op->flags & DF_ENCODE) == 0)
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	1154 continue;
28871f500e84 Add new "flags" field to DMC64EncDecOp, defined by DF_* that can be used to Matti Hamalainen <ccr@tnsp.org> parents: 2194 diff changeset	1155
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1156 // Do we need to reallocate some more space?
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	1157 size = dmC64GetOpSubjectSize(op, fmt->format);
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1158 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	1159 if (!dmGrowBufCheckGrow(buf, chksize))
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1160 {
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	1161 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	1162 "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	1163 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	1164 goto err;
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1165 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1166
811 aebc2f8b2c2d Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1167 // Perform operation
1697 1036b0dcccb5 Refactor DMGrowBuf so that there can be buffers that grow "backwards". Matti Hamalainen <ccr@tnsp.org> parents: 1672 diff changeset	1168 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	1169 switch (op->type)
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1170 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1171 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	1172 case DO_SET_MEM:
1926 f4fa11ecdc6f Add some operators case handlers. Matti Hamalainen <ccr@tnsp.org> parents: 1925 diff changeset	1173 case DO_SET_MEM_HI:
f4fa11ecdc6f Add some operators case handlers. Matti Hamalainen <ccr@tnsp.org> parents: 1925 diff changeset	1174 case DO_SET_MEM_LO:
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1175 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	1176 switch (op->subject)
1373 fc5ee5b4b0e9 Improve handling of extra data. Matti Hamalainen <ccr@tnsp.org> parents: 1372 diff changeset	1177 {
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1178 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	1179 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	1180 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	1181 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	1182 case DS_EXTRA_DATA:
2108 5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	1183 blk = dmC64GetOpMemBlock(img, op->subject, op->bank);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1184 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	1185 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1186 case DO_COPY:
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1187 if (blk->data == NULL)
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1188 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1189 res = dmError(DMERR_NULLPTR,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1190 "'%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	1191 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1192 subjname, i, op->offs, op->offs, op->bank, size, size, buf->len, buf->len);
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1193 goto err;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1194 }
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	1195 if (op->offs2 + size > blk->size)
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1196 {
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1197 res = dmError(DMERR_INTERNAL,
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1198 "'%s' size mismatch %d <> %d in "
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	1199 "op #%d, offs=%d ($%04x), bank=%d, offs2=%d ($%02x), size=%d ($%04x)\n",
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1200 subjname, op->offs2 + size, blk->size, i, op->offs, op->offs, op->bank, op->offs2, op->offs2, size, size);
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1201 goto err;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1202 }
1846 88cef7758303 Implement data block offset in certain DMC64EncDecOps. This allows us to Matti Hamalainen <ccr@tnsp.org> parents: 1833 diff changeset	1203 memcpy(dst, blk->data + op->offs2, size);
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1204 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1205
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1206 case DO_SET_MEM:
1926 f4fa11ecdc6f Add some operators case handlers. Matti Hamalainen <ccr@tnsp.org> parents: 1925 diff changeset	1207 case DO_SET_MEM_HI:
f4fa11ecdc6f Add some operators case handlers. Matti Hamalainen <ccr@tnsp.org> parents: 1925 diff changeset	1208 case DO_SET_MEM_LO:
f4fa11ecdc6f Add some operators case handlers. Matti Hamalainen <ccr@tnsp.org> parents: 1925 diff changeset	1209 case DO_SET_OP:
1918 ba88ff5e85ea Fix a silly bug in the generic c64 bitmap encoder. Matti Hamalainen <ccr@tnsp.org> parents: 1917 diff changeset	1210 // This operation makes no sense in encoding, so do nothing
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1211 break;
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1212
1924 1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1213 default:
1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1214 return dmError(DMERR_INTERNAL,
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1215 "Unhandled op type %s in "
1924 1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1216 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1217 dmC64GetOpType(op->type), 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	1218 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1219 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1220
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1221 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	1222 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	1223 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	1224 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	1225 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	1226 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	1227 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	1228 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1229 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	1230 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	1231 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	1232 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	1233 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	1234 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	1235 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1236 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	1237 {
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1238 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	1239 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	1240 *dst = value;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1241 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1242
1726 f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1243 case DO_SET_MEM_HI:
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1244 *dst \|= (value & 0x0f) << 4;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1245 break;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1246
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1247 case DO_SET_MEM_LO:
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1248 *dst \|= value & 0x0f;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1249 break;
f9128665a47e Implement operator types DO_SET_MEM_HI and DO_SET_MEM_LO. Not used yet. Matti Hamalainen <ccr@tnsp.org> parents: 1725 diff changeset	1250
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1251 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	1252 // 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	1253 break;
1924 1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1254
1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1255 default:
1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1256 return dmError(DMERR_INTERNAL,
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1257 "Unhandled op type %s in "
1924 1c5ea4fa8788 Add some default-case error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1923 diff changeset	1258 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
2171 a39bf85308e5 Add helper function dmC64GetOpType() and use it to display operator type Matti Hamalainen <ccr@tnsp.org> parents: 2157 diff changeset	1259 dmC64GetOpType(op->type), 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	1260 }
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1261 break;
1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1262
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1263 default:
1668 1741717b1ae5 Big overhaul to the enc/dec operator system to be more flexible. Matti Hamalainen <ccr@tnsp.org> parents: 1660 diff changeset	1264 return dmError(DMERR_INTERNAL,
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1265 "Unhandled subject '%s' in "
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1266 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
1853 2081bb4a998a Improve error messaging in generic c64 image encode/decode. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1267 subjname, 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	1268 }
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1269 break;
df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1270
1922 3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1919 diff changeset	1271 case DO_FUNC:
3c6f638ce402 Remove the useless distinction of DO_ENC_FUNC and DO_DEC_FUNC, as the Matti Hamalainen <ccr@tnsp.org> parents: 1919 diff changeset	1272 if (op->encFunction != NULL &&
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1273 (res = op->encFunction(op, buf, img, fmt->format)) != DMERR_OK)
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1274 {
2114 27cf33c3a646 Return actual error code from enc and dec functions instead of just BOOL. Matti Hamalainen <ccr@tnsp.org> parents: 2113 diff changeset	1275 dmErrorMsg(
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 946 diff changeset	1276 "Encode op custom function failed: op #%d, "
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1277 "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	1278 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	1279 goto err;
904 d3cd9f2a8ef1 Some dummy code for encfunctions. Matti Hamalainen <ccr@tnsp.org> parents: 903 diff changeset	1280 }
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1281 break;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1282 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1283 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1284
1448 50402c225ef4 Do not insert load address to the buffer beginning in dmC64EncodeGenericBMP(). Matti Hamalainen <ccr@tnsp.org> parents: 1447 diff changeset	1285 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	1286
1447 de5f7e31a8bf Rename labels. Matti Hamalainen <ccr@tnsp.org> parents: 1443 diff changeset	1287 err:
532 128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1288 return res;
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1289 }
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1290
128a50feff07 Implement initial generic bitmap "encoding" function, that constructs Matti Hamalainen <ccr@tnsp.org> parents: 531 diff changeset	1291
2132 6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1292 static int fmtGetGenericSCPixel(Uint8 col, const DMC64Image img,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1293 const int rasterX, const int rasterY)
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1294 {
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1295 DM_C64_GENERIC_SC_PIXEL_DEFS(img)
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1296
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1297 return dmC64GetGenericSCPixel(
2132 6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1298 col, img,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1299 bmoffs, scroffs,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1300 vshift, 0, 0);
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1301 }
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1302
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1303
2132 6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1304 static int fmtGetGenericMCPixel(Uint8 col, const DMC64Image img,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1305 const int rasterX, const int rasterY)
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1306 {
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1307 DM_C64_GENERIC_MC_PIXEL_DEFS(img)
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1308
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1309 return dmC64GetGenericMCPixel(
2132 6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1310 col, img,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1311 bmoffs, scroffs,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1312 vshift, 0,
6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1313 0, 0, img->bgcolor);
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1314 }
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1315
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1316
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1317 static int fmtGetGenericCharPixel(Uint8 *col,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1318 const DMC64Image *img, const int rasterX, const int rasterY)
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1319 {
2132 6528a1398e8e Add char map helper functions and use them. Matti Hamalainen <ccr@tnsp.org> parents: 2131 diff changeset	1320 DM_C64_GENERIC_CHAR_PIXEL(img)
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1321 int chr = img->screen[0].data[scroffs];
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1322
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1323 if (!img->extraInfo[D64_EI_CHAR_CUSTOM] &&
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1324 img->extraInfo[D64_EI_CHAR_CASE])
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1325 chr += 256; // lower case, so add 256 to char ROM offset
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1326
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1327 switch (img->extraInfo[D64_EI_CHAR_MODE])
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1328 {
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1329 case D64_FMT_HIRES:
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1330 return dmC64GetGenericCharSCPixel(
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1331 col, img,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1332 scroffs, rasterX,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1333 0, (chr * D64_CHR_SIZE) + (rasterY & 7), chr,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1334 0, img->bgcolor);
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1335
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1336 case D64_FMT_MC:
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1337 return dmC64GetGenericCharMCPixel(
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1338 col, img,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1339 scroffs, rasterX,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1340 0, (chr * D64_CHR_SIZE) + (rasterY & 7), chr,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1341 0, img->bgcolor, img->d022, img->d023);
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1342
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1343 case D64_FMT_ECM:
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1344 return dmC64GetGenericCharECMPixel(
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1345 col, img,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1346 scroffs, rasterX,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1347 0, ((chr & 0x3f) * D64_CHR_SIZE) + (rasterY & 7), chr,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1348 0, img->bgcolor, img->d022, img->d023, img->d024);
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1349
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1350 default:
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1351 return dmError(DMERR_INVALID_DATA,
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1352 "Invalid character map image type/fmt=0x%x.\n",
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1353 img->fmt->type);
de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1354 }
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1355 }
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1356
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1357
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1358 // 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	1359 // a indexed/paletted bitmap image.
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1360 int dmC64ConvertGenericBMP2Image(DMImage dst, const DMC64Image src,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1361 const DMC64ImageFormat fmt, const DMC64ImageConvSpec spec)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1362 {
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1363 DMC64GetPixelFunc getPixel;
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 529 diff changeset	1364
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1365 // Sanity check arguments
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1366 if (dst == NULL \|\| src == NULL \|\| fmt == NULL \|\| spec == NULL)
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1367 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1368
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1944 diff changeset	1369 if (dst->width != src->fmt->width \|\| dst->height != src->fmt->height)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1370 {
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1371 return dmError(DMERR_INVALID_DATA,
361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1372 "Invalid src vs. dst width/height %d x %d <-> %d x %d\n",
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1944 diff changeset	1373 src->fmt->width, src->fmt->height, dst->width, dst->height);
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1374 }
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1375
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1134 diff changeset	1376 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	1377
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1378 // Check pixel getter function
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1944 diff changeset	1379 if (src->fmt->getPixel != NULL)
8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1944 diff changeset	1380 getPixel = src->fmt->getPixel;
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1381 else
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1382 if (src->fmt->type & D64_FMT_CHAR)
2172 de88333acc44 Move the PETSCII getpixel function to lib64gfx.c and remove the Matti Hamalainen <ccr@tnsp.org> parents: 2171 diff changeset	1383 getPixel = fmtGetGenericCharPixel;
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1384 else
2180 33cf1b330b7b s/D64_FMT_MASK/D64_FMT_MODE_MASK/g Matti Hamalainen <ccr@tnsp.org> parents: 2179 diff changeset	1385 switch (src->fmt->type & D64_FMT_MODE_MASK)
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1386 {
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1387 case D64_FMT_MC : getPixel = fmtGetGenericMCPixel; break;
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1388 case D64_FMT_HIRES : getPixel = fmtGetGenericSCPixel; break;
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1389 default:
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1390 return dmError(DMERR_INVALID_DATA,
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1391 "Invalid bitmap image type/fmt=0x%x.\n",
2118 05a6e00b09d0 Change D64_FMT_* MASK constants and how they are used. Matti Hamalainen <ccr@tnsp.org> parents: 2117 diff changeset	1392 src->fmt->type);
05a6e00b09d0 Change D64_FMT_* MASK constants and how they are used. Matti Hamalainen <ccr@tnsp.org> parents: 2117 diff changeset	1393 }
1375 f5368c13a872 Implement more flexible generic format decoding by separating the pixel Matti Hamalainen <ccr@tnsp.org> parents: 1373 diff changeset	1394
931 2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1395 // Perform conversion
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1396 for (int yc = 0; yc < dst->height; yc++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1397 {
1919 f0225a52afce Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1918 diff changeset	1398 Uint8 dp = dst->data + (yc dst->pitch);
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1399 for (int xc = 0; xc < dst->width; xc++, dp++)
917 df3a74f230d9 Initial implementation of charmode support in lib64gfx. Matti Hamalainen <ccr@tnsp.org> parents: 916 diff changeset	1400 {
2128 a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1401 int res;
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1402 if ((res = getPixel(dp, src, xc, yc)) != DMERR_OK)
a8f5295ab2e7 Validate format index values better in dmC64GetImageTypeString(). Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	1403 return res;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1404 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1405 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1406
508 1ed5025c2538 Return DMLIB error values instead of arbitrary 0/negatives. Matti Hamalainen <ccr@tnsp.org> parents: 507 diff changeset	1407 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	1408 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1409
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1410
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1411 int dmC64ConvertBMP2Image(DMImage *pdst, const DMC64Image src,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1412 const DMC64ImageFormat fmt, const DMC64ImageConvSpec spec)
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1413 {
940 ff18d2511843 Remove the doubleMC madness completely. Should be replaced with x/y aspect Matti Hamalainen <ccr@tnsp.org> parents: 939 diff changeset	1414 int res;
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1415 DMImage *dst;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1416
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1417 if (pdst == NULL \|\| src == NULL \|\| fmt == NULL \|\| spec == NULL)
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1418 return DMERR_NULLPTR;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1419
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1420 // Allocate image structure
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1944 diff changeset	1421 if ((*pdst = dst = dmImageAlloc(
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2147 diff changeset	1422 src->fmt->width, src->fmt->height, DM_PIXFMT_PALETTE, -1)) == NULL)
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1423 return DMERR_MALLOC;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1424
2201 9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	1425 // Set palette information
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	1426 if (spec->pal != NULL)
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	1427 dst->pal = spec->pal;
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	1428 else
9f3fb4004c20 Improvements to the lib64gfx palette handling. Matti Hamalainen <ccr@tnsp.org> parents: 2200 diff changeset	1429 if ((res = dmC64SetImagePalette(dst, spec->cpal, FALSE)) != DMERR_OK)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2061 diff changeset	1430 return res;
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1431
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1432 // Convert
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1433 if (fmt->format->convertFrom != NULL)
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1434 res = fmt->format->convertFrom(dst, src, fmt, spec);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1435 else
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1436 res = dmC64ConvertGenericBMP2Image(dst, src, fmt, spec);
556 44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1437
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1438 return res;
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1439 }
44d1e0d4acf3 Improve DMC64Image -> DMImage conversion facilities. Matti Hamalainen <ccr@tnsp.org> parents: 548 diff changeset	1440
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1441
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1442 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	1443 const size_t probeOffs, const size_t loadOffs,
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 515 diff changeset	1444 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	1445 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1446 DMGrowBuf tmp;
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1447
a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1448 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	1449 return DMERR_NULLPTR;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1450
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1451 // Check for forced format
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1452 if (forced != NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1453 *fmt = forced;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1454 else
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1455 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1456 // 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	1457 if (probeOffs >= buf->len)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1458 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	1459
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1744 diff changeset	1460 dmGrowBufConstCopyOffs(&tmp, buf, probeOffs);
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1461 if (dmC64ProbeBMP(&tmp, fmt) == DM_PROBE_SCORE_FALSE)
1460 361cad3b8445 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1462 return DMERR_NOT_SUPPORTED;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1463 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1464
1710 1f0fac3af8e3 Use buf->len instead of tmp.len, as it might not be initialized. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1465 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	1466 return DMERR_INVALID_ARGS;
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1467
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1468 if (*fmt == NULL)
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1469 return DMERR_NOT_SUPPORTED;
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1470
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1471 // Format supports only reading?
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1472 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	1473 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	1474
2270d7f3af77 Refactor the DMC64Image handling to be more dynamic, and start Matti Hamalainen <ccr@tnsp.org> parents: 927 diff changeset	1475 // Allocate memory
1378 c465860e44ed Make c64 image bank allocation dynamic. Matti Hamalainen <ccr@tnsp.org> parents: 1377 diff changeset	1476 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	1477 return DMERR_MALLOC;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1478
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1744 diff changeset	1479 dmGrowBufConstCopyOffs(&tmp, buf, loadOffs);
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1480
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 410 diff changeset	1481 // 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	1482 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	1483 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	1484 else
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1697 diff changeset	1485 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	1486 }
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1487
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1488
2109 510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1489 int dmC64MemBlockAllocSubj(DMC64Image *img, const int subject, const int bank)
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1490 {
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1491 const char *subjname = dmC64GetOpSubjectName(subject);
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1492 size_t size = dmC64GetSubjectSize(subject, img->fmt);
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1493 DMC64MemBlock blk = (DMC64MemBlock ) dmC64GetOpMemBlock(img, subject, bank);
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1494 int res;
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1495
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1496 if ((res = dmC64MemBlockAlloc(blk, size)) != DMERR_OK)
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1497 {
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1498 return dmError(res,
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1499 "Could not allocate '%s' block with size %d bytes.\n",
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1500 subjname, size);
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1501 }
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1502
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1503 return DMERR_OK;
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1504 }
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1505
510ea816d1ff Add helper function dmC64MemBlockAllocSubj(). Matti Hamalainen <ccr@tnsp.org> parents: 2108 diff changeset	1506
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1507 // Convert a generic bitmap image to DMC64Image
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1508 int dmC64ConvertGenericImage2BMP(DMC64Image dst, const DMImage src,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1509 const DMC64ImageFormat fmt, const DMC64ImageConvSpec spec)
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1510 {
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1511 if (dst == NULL \|\| src == NULL \|\| fmt == NULL \|\| spec == 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	1512 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	1513
1949 f8e2728c1b7f Return DMERR_NOT_SUPPORTED from dmC64ConvertGenericImage2BMP() as it does Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	1514 return DMERR_NOT_SUPPORTED;
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1515 }
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1516
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1517
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1518 int dmC64ConvertImage2BMP(DMC64Image *pdst, const DMImage src,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1519 const DMC64ImageFormat fmt, const DMC64ImageConvSpec spec)
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1520 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1521 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	1522 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	1523
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1524 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	1525 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	1526
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1527 // 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	1528 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	1529 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	1530
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1531 // Convert
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1532 if (fmt->format->convertTo != NULL)
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1533 res = fmt->format->convertTo(dst, src, fmt, spec);
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1534 else
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1927 diff changeset	1535 res = dmC64ConvertGenericImage2BMP(dst, src, fmt, spec);
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1536
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1537 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	1538 }
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1539
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1540
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1541 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	1542 {
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1543 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	1544
1580 72f809e6eb3c Add NULL check for growbuf pointer. Matti Hamalainen <ccr@tnsp.org> parents: 1573 diff changeset	1545 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	1546 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	1547
1548 20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1548 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	1549 return DMERR_NOT_SUPPORTED;
20cd589366d7 Check C64 bitmap format flags in encode/decode functions. Matti Hamalainen <ccr@tnsp.org> parents: 1542 diff changeset	1550
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1551 // Allocate a buffer
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1552 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	1553 goto err;
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1554
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1555 // Add the loading address
1828 6e1dd79c6bce Use dmGrowBufPutU16LE() instead of two dmGrowBufPutU8() to push the loading Matti Hamalainen <ccr@tnsp.org> parents: 1827 diff changeset	1556 if (!dmGrowBufPutU16LE(buf, fmt->addr))
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1557 goto err;
32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1558
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1559 // 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	1560 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	1561 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	1562 else
1499 32640e1934d5 Simplify some encoding bits. Matti Hamalainen <ccr@tnsp.org> parents: 1498 diff changeset	1563 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	1564
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1565 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	1566 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	1567
1797 5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1568 // Finally, if the format has a set size and our buffer is smaller
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1569 // than that size, we grow the buffer to match (with zeroed data).
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1570 // This accounts for format variants that are otherwise identical.
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1571 if (fmt->size > 0 && buf->len < fmt->size &&
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1572 !dmGrowBufCheckGrow(buf, fmt->size))
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1573 {
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1574 res = DMERR_MALLOC;
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1575 goto err;
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1576 }
5204fab92c9e If the c64 image format has a set size and our buffer after encoding in Matti Hamalainen <ccr@tnsp.org> parents: 1790 diff changeset	1577
1469 0046b4e1b35f Various fixes in bmp encoding. Matti Hamalainen <ccr@tnsp.org> parents: 1467 diff changeset	1578 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	1579
32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1580 err:
1799 708d333734f9 Comment. Matti Hamalainen <ccr@tnsp.org> parents: 1797 diff changeset	1581 // In error case, free the buffer
1467 32203356c652 Add some new functions that are mostly just stubs and not working tho. Matti Hamalainen <ccr@tnsp.org> parents: 1466 diff changeset	1582 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	1583 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	1584 }
1774 88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1585
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1586
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1587 // Perform probing of the given data buffer, trying to determine
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1588 // if it contains a supported "C64" image format. Returns the
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1589 // "probe score", see libgfx.h for list of values. If a match
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1590 // is found, pointer to format description is set to *pfmt.
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1591 int dmC64ProbeBMP(const DMGrowBuf buf, const DMC64ImageFormat *pfmt)
1774 88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1592 {
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1593 int scoreMax = DM_PROBE_SCORE_FALSE, scoreIndex = -1;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1594
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1595 for (int i = 0; i < ndmC64ImageFormats; i++)
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1596 {
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1597 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1598 int score = DM_PROBE_SCORE_FALSE;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1599 if (fmt->probe == NULL && fmt->size > 0 && fmt->addr > 0)
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1600 {
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1601 // Generic probe just checks matching size and load address
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1602 if (buf->len == fmt->size && dmCompareAddr16(buf, 0, fmt->addr))
1774 88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1603 score = DM_PROBE_SCORE_GOOD;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1604 }
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1605 else
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1606 if (fmt->probe != NULL)
1780 5ea4713e9e0f Change c64 format probing API to use DMGrowBuf. Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1607 score = fmt->probe(buf, fmt);
1774 88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1608
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1609 if (score > scoreMax)
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1610 {
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1611 scoreMax = score;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1612 scoreIndex = i;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1613 }
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1614 }
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1615
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1616 if (scoreIndex >= 0)
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1617 {
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1618 *pfmt = &dmC64ImageFormats[scoreIndex];
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1619 return scoreMax;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1620 }
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1621 else
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1622 return DM_PROBE_SCORE_FALSE;
88354355b8e1 Move dmC64ProbeBMP() to more logical place in the source. Matti Hamalainen <ccr@tnsp.org> parents: 1764 diff changeset	1623 }
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1624
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1625
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1626 BOOL dmLib64GFXInitialized = FALSE;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1627 DMC64ImageFormat **dmC64ImageFormatsSorted = NULL;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1628
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1629
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1630 int dmC64ImageFormatCompare(const void va, const void vb)
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1631 {
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1632 const DMC64ImageFormat
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1633 fmta = (DMC64ImageFormat **) va,
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1634 fmtb = (DMC64ImageFormat **) vb;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1635
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1636 int res = fmta->format->type - fmtb->format->type;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1637 if (res == 0)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1638 return strcmp(fmta->name, fmtb->name);
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1639 else
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1640 return res;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1641 }
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1642
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1643
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1644 int dmLib64GFXInit(void)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1645 {
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1646 // Safety check
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1647 if (dmLib64GFXInitialized)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1648 dmLib64GFXClose();
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1649
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1650 dmLib64GFXInitialized = TRUE;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1651
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1652 if ((dmC64ImageFormatsSorted = dmCalloc(ndmC64ImageFormats, sizeof(dmC64ImageFormatsSorted[0]))) == NULL)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1653 return DMERR_MALLOC;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1654
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1655 for (int i = 0; i < ndmC64ImageFormats; i++)
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1656 {
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1657 DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1658 if (fmt->format == NULL)
4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1659 fmt->format = &fmt->formatDef;
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1660
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1661 dmC64ImageFormatsSorted[i] = fmt;
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1662 }
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1663
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1664 qsort(dmC64ImageFormatsSorted, ndmC64ImageFormats,
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1665 sizeof(DMC64ImageFormat *), dmC64ImageFormatCompare);
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1666
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1667 return DMERR_OK;
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1774 diff changeset	1668 }
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1669
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1670
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1671 void dmLib64GFXClose(void)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1672 {
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1673 dmFreeR(&dmC64ImageFormatsSorted);
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1674 dmLib64GFXInitialized = FALSE;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2196 diff changeset	1675 }

Mercurial > hg > dmlib

annotate tools/lib64gfx.c @ 2204:cbac4912992c