dmlib: gfxconv.c annotate

annotate gfxconv.c @ 489:fca3c240ccac

Implement simplistic image input to char/sprite splitter conversion.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 12 Nov 2012 22:04:17 +0200
parents	49f0ce2cc347
children	7e376a853105

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 * gfxconv - Convert various 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	3 * Programmed and designed by Matti 'ccr' Hamalainen
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * (C) Copyright 2012 Tecnic Software productions (TNSP)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * 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	7 */
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "dmlib.h"
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 "dmargs.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #include "dmfile.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 #include "dmmutex.h"
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	12 #include "libgfx.h"
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 #include "lib64gfx.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15 //#define UNFINISHED 1
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	17 #define DM_MAX_COLORS 256
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	18
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	19 #define ASC_NBITS 8
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	20 #define ASC_NCOLORS 4
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	21 static const char dmASCIIPalette[ASC_NCOLORS] = ".:X#";
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	22
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 enum
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	25 FFMT_AUTO = 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	26
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	27 FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	28 FFMT_ANSI,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	29 FFMT_IMAGE,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	31 FFMT_CHAR,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	32 FFMT_SPRITE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	33 FFMT_BITMAP,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	35 FFMT_LAST
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	38
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	39 typedef struct
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	40 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	41 char *name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	42 char *fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	43 BOOL in, out;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	44 int format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	45 int subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	46 } DMConvFormat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	47
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	48
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	49 static DMConvFormat convFormatList[] =
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	51 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	52 "ASCII text", "asc", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	53 FFMT_ASCII , 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	54 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	55 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	56 "ANSI colored text", "ansi", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	57 FFMT_ANSI , 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	58 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	59 {
454 2f820412d356 Mark PNG as available input format. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	60 "PNG image file", "png", TRUE, TRUE,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	61 FFMT_IMAGE , IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	62 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	63 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	64 "PPM image file", "ppm", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	65 FFMT_IMAGE , IMGFMT_PPM,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	66 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	67 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	68 "PCX image file", "pcx", TRUE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	69 FFMT_IMAGE , IMGFMT_PCX,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	70 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	71 {
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	72 "IFF ILBM file", "lbm", TRUE, FALSE,
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	73 FFMT_IMAGE , IMGFMT_ILBM,
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	74 },
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	75
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	76 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	77 "IFFMaster RAW image file", "araw", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	78 FFMT_IMAGE , IMGFMT_ARAW,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	79 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	80
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	81 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	82 "C64 bitmap image file", NULL, TRUE, FALSE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	83 FFMT_BITMAP , 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	84 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	85
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	86 {
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	87 "C64 character/font data", "chr", TRUE, TRUE,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	88 FFMT_CHAR , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	89 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	90 {
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	91 "C64 sprite data", "spr", TRUE, TRUE,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	92 FFMT_SPRITE , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	93 },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	96 static const int nconvFormatList = sizeof(convFormatList) / sizeof(convFormatList[0]);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	99 typedef struct
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	100 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	101 BOOL triplet, alpha;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	102 DMColor color;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	103 int from, to;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	104 } DMMapValue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	105
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 char *optInFilename = NULL,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 *optOutFilename = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	110 int optInFormat = FFMT_AUTO,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	111 optOutFormat = FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	112 optInSubFormat = IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	113 optOutSubFormat = IMGFMT_PNG,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 optItemCount = -1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 optPlanedWidth = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	116 optForcedFormat = -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	117 int optInSkip = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 BOOL optInMulticolor = FALSE,
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	119 optSequential = FALSE,
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	120 optRemapColors = FALSE,
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	121 optRemapRemove = FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	122 int optNRemapTable = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	123 DMMapValue optRemapTable[DM_MAX_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	124 int optColors[C64_MAX_COLORS];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	126 DMImageSpec optSpec =
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	127 {
457 9a5ceedf0972 Set default scaling to 1. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	128 .scale = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	129 .nplanes = 4,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	130 .interleave = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	131 .paletted = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	132 .format = 0,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	133 };
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 static DMOptArg optList[] =
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 {
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	137 { 0, '?', "help", "Show this help", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	138 { 15, 'v', "verbose", "Increase verbosity", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	139 { 3, 'o', "output", "Output filename", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	140 { 1, 'i', "informat", "Set input format ([s]prite, [c]har, [b]itmap, [i]mage)", OPT_ARGREQ },
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	141 { 2, 'm', "multicolor", "Input is multicolor / output in multicolor", OPT_NONE },
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	142 { 4, 's', "skip", "Skip bytes in input", OPT_ARGREQ },
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	143 { 5, 'f', "format", "Output format (see --formats)", OPT_ARGREQ },
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	144 { 17, 'F', "formats", "Output format (see list below)", OPT_NONE },
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	145 { 8, 'q', "sequential", "Output sequential files (image output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	146 { 6, 'c', "colormap", "Color mappings (see below for information)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	147 { 7, 'n', "numitems", "How many 'items' to view (default: all)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	148 { 9, 'S', "scale", "Scale output by x (image output only)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	149 { 10, 'b', "bformat", "Force input bitmap format (see below)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	150 { 11, 'w', "width", "Item width (number of items per row, min 1)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	151 { 12, 'P', "paletted", "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	152 { 13, 'B', "bplanes", "Bits per pixel OR # of bitplanes (certain output formats)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	153 { 14, 'I', "interleave", "Interleave scanlines (default: output whole planes)", OPT_NONE },
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	154 { 16, 'R', "remap", "Remap output image colors (-R <(#RRGGBB\|index):index>[,<..>] \| -R @map.txt)", OPT_ARGREQ },
480 d7fc7e011c90 Oops, the option help had \n. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 479 diff changeset	155 { 18, 'r', "remap-remove", "Remove unused colors from remapped palette (requires -R)", OPT_NONE },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 static const int optListN = sizeof(optList) / sizeof(optList[0]);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	161 void argShowFormats()
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	165 printf("\n"
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	166 "Available input/output formats:\n"
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	167 " EXT \| I \| O \| Description\n"
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	168 "------+---+---+--------------------------------\n"
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	169 );
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	170
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	171 for (i = 0; i < nconvFormatList; 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	172 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	173 DMConvFormat *fmt = &convFormatList[i];
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	174 printf("%-5s \| %c \| %c \| %s\n",
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	175 fmt->fext ? fmt->fext : "",
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	176 fmt->in ? 'X' : ' ',
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	177 fmt->out ? 'X' : ' ',
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	178 fmt->name);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 printf("\nAvailable bitmap formats:\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 for (i = 0; i < ndmC64ImageFormats; i++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	184 DMC64ImageFormat *fmt = &dmC64ImageFormats[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	185 printf("%3d \| %-5s \| %-15s \| %s\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 i, fmt->extension,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 dmC64ImageTypeNames[fmt->type],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 fmt->name);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	190 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	191
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	192
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	193 void argShowHelp()
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	194 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	195 dmPrintBanner(stdout, dmProgName, "[options] <input file>");
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	196 dmArgsPrintHelp(stdout, optList, optListN);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 printf(
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 "\n"
456 20122cffde2f Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	200 "Color map definitions are used for ANSI and image output, to declare what\n"
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 "output colors of the C64 palette are used for each single color/multi color\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 "bit-combination. For example, if the input is multi color sprite or char,\n"
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	203 "you can define colors like: -c 0,8,3,15 .. for single color: -c 0,1\n"
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 "The numbers are palette indexes, and the order is for bit(pair)-values\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 "00, 01, 10, 11 (multi color) and 0, 1 (single color). NOTICE! 255 is the\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 "special color that can be used for transparency.\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 );
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	211 int dmGetConvFormat(int format, int subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	212 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	213 int i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	214 for (i = 0; i < nconvFormatList; i++)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	215 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	216 DMConvFormat *fmt = &convFormatList[i];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	217 if (fmt->format == format &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	218 fmt->subformat == subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	219 return i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	220 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	221 return -1;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	222 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	223
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	224
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	225 BOOL dmGetFormatByExt(const char fext, int format, int *subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	226 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	227 int i;
430 77fae3e4e4d3 Fix a segfault due to not checking for NULL file extension entries in dmGetFormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	228 if (fext == NULL)
77fae3e4e4d3 Fix a segfault due to not checking for NULL file extension entries in dmGetFormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	229 return FALSE;
77fae3e4e4d3 Fix a segfault due to not checking for NULL file extension entries in dmGetFormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	230
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	231 for (i = 0; i < nconvFormatList; i++)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	232 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	233 DMConvFormat *fmt = &convFormatList[i];
430 77fae3e4e4d3 Fix a segfault due to not checking for NULL file extension entries in dmGetFormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	234 if (fmt->fext != NULL &&
77fae3e4e4d3 Fix a segfault due to not checking for NULL file extension entries in dmGetFormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 429 diff changeset	235 strcasecmp(fext, fmt->fext) == 0)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	236 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	237 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	238 *subformat = fmt->subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	239 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	240 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	241 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	242 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	243 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	244
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	245
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	246 static BOOL dmParseMapOptionMapItem(const char popt, DMMapValue value, const int nmax, const char *msg)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	247 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	248 char end, split, *opt = dm_strdup(popt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	249
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	250 if (opt == NULL)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	251 goto error;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	252
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	253 if ((end = split = strchr(opt, ':')) == NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	254 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	255 dmError("Invalid %s value '%s', expected <(#\|%)RRGGBB\|[$\|0x]index>:<[$\|0x]index>.\n", msg, opt);
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	256 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	257 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	258
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	259 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	260 *end = 0;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	261 for (end--; end > opt && end && isspace(end); end--)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	262 *end = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	263
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	264 // Parse either a hex triplet color definition or a normal value
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	265 if (opt == '#' \|\| opt == '%')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	266 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	267 int colR, colG, colB, colA;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	268
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	269 if (sscanf(opt + 1, "%2x%2x%2x%2x", &colR, &colG, &colB, &colA) == 4 \|\|
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	270 sscanf(opt + 1, "%2X%2X%2X%2X", &colR, &colG, &colB, &colA) == 4)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	271 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	272 value->alpha = TRUE;
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	273 value->color.a = colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	274 }
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	275 else
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	276 if (sscanf(opt + 1, "%2x%2x%2x", &colR, &colG, &colB) != 3 &&
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	277 sscanf(opt + 1, "%2X%2X%2X", &colR, &colG, &colB) != 3)
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	278 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	279 dmError("Invalid %s value '%s', expected a hex triplet, got '%s'.\n", msg, popt, opt + 1);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	280 goto error;
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	281 }
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	282
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	283 value->color.r = colR;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	284 value->color.g = colG;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	285 value->color.b = colB;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	286 value->triplet = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	287 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	288 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	289 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	290 if (!dmGetIntVal(opt, &value->from))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	291 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	292 dmError("Invalid %s value '%s', could not parse source value '%s'.\n", msg, popt, opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	293 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	294 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	295 value->triplet = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	296 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	297
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	298 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	299 split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	300 while (split && isspace(split)) split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	301
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	302 // Parse destination value
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	303 if (!dmGetIntVal(split, &value->to))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	304 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	305 dmError("Invalid %s value '%s', could not parse destination value '%s'.\n", msg, popt, split);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	306 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	307 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	308
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	309 if (!value->triplet && (value->from < 0 \|\| value->from > 255))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	310 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	311 dmError("Invalid %s map source color index value %d, must be [0..255].\n", msg, value->from);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	312 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	313 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	314
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	315 if (value->to < 0 \|\| value->to > nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	316 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	317 dmError("Invalid %s map destination color index value %d, must be [0..%d].\n", msg, value->to, nmax);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	318 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	319 }
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	320
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	321 dmFree(opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	322 return TRUE;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	323
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	324 error:
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	325 dmFree(opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	326 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	327 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	328
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	329
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	330 static BOOL dmParseMapOptionItem(char opt, char end, void pvalue, const int index, const int nmax, const BOOL requireIndex, const char msg)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	331 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	332 // Trim whitespace
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	333 if (end != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	334 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	335 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	336 for (end--; end > opt && end && isspace(end); end--)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	337 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	338 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	339 while (opt && isspace(opt)) opt++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	340
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	341 // Parse item based on mode
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	342 if (requireIndex)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	343 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	344 DMMapValue value = (DMMapValue ) pvalue;
475 c0dedfef3edf Fix option parsing of mappings. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	345 if (!dmParseMapOptionMapItem(opt, &value[index], nmax, msg))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	346 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	347 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	348 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	349 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	350 int value = (int ) pvalue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	351 char *split = strchr(opt, ':');
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	352 if (split != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	353 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	354 dmError("Unexpected ':' in indexed %s '%s'.\n", msg, opt);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	355 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	356 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	357
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	358 if (!dmGetIntVal(opt, &value[index]))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	359 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	360 dmError("Invalid %s value '%s', could not parse.\n", msg, opt);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	361 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	362 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	363 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	364
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	365 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	366 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	367
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	368
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	369 BOOL dmParseMapOptionString(char opt, void values, int nvalues, const int nmax, const BOOL requireIndex, const char msg)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	370 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	371 char end, start = opt;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	372
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	373 *nvalues = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	374 while (nvalues < nmax && start && (end = strchr(start, ',')) != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	375 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	376 if (!dmParseMapOptionItem(start, end, values, *nvalues, nmax, requireIndex, msg))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	377 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	378
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	379 start = end + 1;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	380 (*nvalues)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	381 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	382
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	383 if (start && nvalues < nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	384 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	385 if (!dmParseMapOptionItem(start, NULL, values, *nvalues, nmax, requireIndex, msg))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	386 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	387
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	388 (*nvalues)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	389 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	390
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	391 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	392 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	393
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	394
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	395 int dmParseColorRemapFile(const char filename, DMMapValue values, int *nvalue, const int nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	396 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	397 FILE *fp;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	398 char line[512];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	399 int res = DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	400
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	401 if ((fp = fopen(filename, "r")) == NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	402 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	403 res = dmGetErrno();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	404 dmError("Could not open color remap file '%s' for reading, %d: %s\n",
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	405 res, dmErrorStr(res));
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	406 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	407 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	408
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	409 while (fgets(line, sizeof(line), fp))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	410 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	411 char *start = line;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	412 while (start && isspace(start)) start++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	413
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	414 if (start != 0 && start != ';')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	415 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	416 if (!dmParseMapOptionMapItem(line, &values[*nvalue], nmax, "mapping file"))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	417 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	418 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	419 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	420 (*nvalue)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	421 if (*nvalue >= nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	422 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	423 dmError("Too many mapping pairs in '%s', maximum is %d.\n",
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	424 filename, nmax);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	425 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	426 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	427 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	428 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	429 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	430
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	431 error:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	432 fclose(fp);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	433 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	434 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	435
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	436
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 BOOL argHandleOpt(const int optN, char optArg, char currArg)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 switch (optN)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 case 0:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443 exit(0);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	446 case 17:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	447 argShowFormats();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	448 exit(0);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	449 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	450
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	451 case 15:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	452 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	453 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	454
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455 case 1:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	456 switch (tolower(optArg[0]))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	458 case 's':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	459 optInFormat = FFMT_SPRITE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 case 'c':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	462 optInFormat = FFMT_CHAR;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 break;
416 238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	464 case 'b':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	465 optInFormat = FFMT_BITMAP;
416 238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	466 break;
238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	467 case 'i':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	468 optInFormat = FFMT_IMAGE;
416 238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	469 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	470 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 dmError("Invalid input format '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476 case 2:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 optInMulticolor = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 case 3:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 optOutFilename = optArg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 case 4:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 if (!dmGetIntVal(optArg, &optInSkip))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 dmError("Invalid skip value argument '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492 case 5:
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	493 if (!dmGetFormatByExt(optArg, &optOutFormat, &optOutSubFormat))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	495 dmError("Invalid output format '%s'.\n", optArg);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	496 return FALSE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 case 6:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 {
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	502 int index, ncolors;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	503 if (!dmParseMapOptionString(optArg, optColors,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	504 &ncolors, C64_MAX_COLORS, FALSE, "color table option"))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	505 return FALSE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 dmMsg(1, "Set color table: ");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	508 for (index = 0; index < ncolors; index++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 dmPrint(1, "[%d:%d]%s",
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	511 index, optColors[index],
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	512 (index < ncolors) ? ", " : "");
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 dmPrint(1, "\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 case 7:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 if (sscanf(optArg, "%d", &optItemCount) != 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 dmError("Invalid count value argument '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 case 8:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 optSequential = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 case 9:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 int tmp = atoi(optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533 if (tmp < 1 \|\| tmp > 50)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 dmError("Invalid scale value '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	538 optSpec.scale = tmp;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 case 11:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 int tmp = atoi(optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 if (tmp < 1 \|\| tmp > 512)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 dmError("Invalid width value '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 optPlanedWidth = tmp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 case 12:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	555 optSpec.paletted = TRUE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	558 case 13:
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	559 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	560 int tmp = atoi(optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	561 if (tmp < 1 \|\| tmp > 8)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	562 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	563 dmError("Invalid bitplanes/bpp value '%s'.\n", optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	564 return FALSE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	565 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	566 optSpec.nplanes = tmp;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	567 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	568 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	569
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	570 case 14:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	571 optSpec.interleave = TRUE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	572 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	573
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	574
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	575 case 16:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	576 if (optArg[0] == '@')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	577 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	578 if (optArg[1] != 0)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	579 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	580 int res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	581 if ((res = dmParseColorRemapFile(optArg + 1,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	582 optRemapTable, &optNRemapTable, DM_MAX_COLORS)) != DMERR_OK)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	583 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	584 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	585 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	586 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	587 dmError("No remap filename given.\n");
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	588 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	589 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	590 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	591 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	592 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	593 if (!dmParseMapOptionString(optArg, optRemapTable,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	594 &optNRemapTable, DM_MAX_COLORS, TRUE, "color remap option"))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	595 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	596 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	597
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	598 optRemapColors = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	599 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	600
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	601 case 18:
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	602 optRemapRemove = TRUE;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	603 break;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	604
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 dmError("Unknown option '%s'.\n", currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 return TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 BOOL argHandleFile(char *currArg)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 if (!optInFilename)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 optInFilename = currArg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620 dmError("Source filename already specified, extraneous argument '%s'.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 return TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629 void dmPrintByte(FILE *out, int byte, int format, BOOL multicolor)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633 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	634 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 for (i = ASC_NBITS; i; i -= 2)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637 int val = (byte & (3ULL << (i - 2))) >> (i - 2);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	638 char ch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	639 switch (format)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	640 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	641 case FFMT_ASCII:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	642 ch = dmASCIIPalette[val];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 fprintf(out, "%c%c", ch, ch);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	645 case FFMT_ANSI:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 fprintf(out, "%c[0;%d;%dm##%c[0m",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 31 + optColors[val],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	652 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 for (i = ASC_NBITS; i; i--)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659 int val = (byte & (1ULL << (i - 1))) >> (i - 1);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 char ch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 switch (format)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	663 case FFMT_ASCII:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664 ch = val ? '#' : '.';
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665 fputc(ch, out);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	667 case FFMT_ANSI:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 fprintf(out, "%c[0;%d;%dm %c[0m",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 31 + optColors[val],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	680 void dmDumpCharASCII(FILE outFile, const Uint8 buf, int *offs, int format, BOOL multicolor)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 int yc;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 for (yc = 0; yc < C64_CHR_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	685 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 fprintf(outFile, "%04x : ", *offs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687 dmPrintByte(outFile, buf[yc], format, multicolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 fprintf(outFile, "\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	694 void dmDumpSpriteASCII(FILE outFile, const Uint8 buf, int *offs, int format, BOOL multicolor)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 int bufOffs, xc, yc;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	697
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698 for (bufOffs = yc = 0; yc < C64_SPR_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	699 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700 fprintf(outFile, "%04x : ", *offs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 for (xc = 0; xc < C64_SPR_WIDTH; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 dmPrintByte(outFile, buf[bufOffs], format, multicolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 fprintf(outFile, " ");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	708 fprintf(outFile, "\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	710 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	713
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714 #ifdef UNFINISHED
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	715 int dmConvertBMP2(DMImage screen, const DM64Image img)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717 int yc;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	718 Uint8 *dp = screen->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	719
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	720 for (yc = 0; yc < screen->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	721 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	722 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	723 const int y = yc / 8, yb = yc & 7;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 const int scroffsy = y * C64_SCR_CH_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 const int bmoffsy = y * C64_SCR_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 int xc;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	727
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	728 for (xc = 0; xc < screen->width / 2; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	729 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 const int x = 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	731 const int scroffs = scroffsy + x;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732 const int b = img->bitmap[0][bmoffsy + (x * 8) + yb];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	733 const int v = 6 - ((xc * 2) & 6);
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	734 Uint8 c;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736 switch ((b >> v) & 3)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	737 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 case 0: c = img->bgcolor; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	739 case 1: c = img->screen[0][scroffs] >> 4; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740 case 2: c = img->screen[0][scroffs] & 15; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 case 3: c = img->color[0][scroffs] & 15; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	744 *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	745 *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	746 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	747
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748 dp += screen->pitch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	750
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	751 return 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	753 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	756 int dmRemapImageColors(DMImage *image)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	757 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	758 DMColor *npal = dmCalloc(image->ncolors, sizeof(DMColor));
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	759 int mapping = dmMalloc(image->ncolors sizeof(int));
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	760 BOOL mapped = dmMalloc(image->ncolors sizeof(BOOL));
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	761 BOOL used = dmMalloc(image->ncolors sizeof(BOOL));
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	762 int n, index, xc, yc, ncolors;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	763
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	764 dmMsg(1, "Remapping %d output image colors of %d colors.\n", optNRemapTable, image->ncolors);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	765
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	766 if (npal == NULL \|\| mapping == NULL \|\| mapped == NULL \|\| used == NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	767 {
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	768 dmError("Could not allocate memory for reused palette.\n");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	769 return DMERR_MALLOC;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	770 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	771
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	772 for (index = 0; index < image->ncolors; index++)
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	773 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	774 mapping[index] = -1;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	775 mapped[index] = used[index] = FALSE;
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	776 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	777
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	778 // Find used colors
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	779 dmMsg(2, "Scanning image for used colors...\n");
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	780 for (ncolors = yc = 0; yc < image->height; yc++)
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	781 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	782 Uint8 dp = image->data + image->pitch yc;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	783 for (xc = 0; xc < image->width; xc++)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	784 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	785 Uint8 col = dp[xc];
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	786 if (col < image->ncolors && !used[col])
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	787 {
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	788 used[col] = TRUE;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	789 ncolors++;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	790 }
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	791 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	792 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	793 dmMsg(2, "Found %d used colors, creating remap-table.\n", ncolors);
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	794
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	795 // Match and mark mapped colors
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	796 for (index = 0; index < optNRemapTable; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	797 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	798 DMMapValue *map = &optRemapTable[index];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	799 if (map->triplet)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	800 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	801 BOOL found = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	802 for (n = 0; n < image->ncolors; n++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	803 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	804 if (dmCompareColor(&(image->pal[n]), &(map->color), map->alpha))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	805 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	806 dmMsg(3, "RGBA match #%02x%02x%02x%02x: %d -> %d\n",
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	807 map->color.r, map->color.g, map->color.b, map->color.a,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	808 n,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	809 map->to);
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	810
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	811 mapping[n] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	812 mapped[map->to] = TRUE;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	813 found = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	814 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	815 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	816
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	817 if (!found)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	818 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	819 dmMsg(3, "No RGBA match found for map index %d, #%02x%02x%02x%02x\n",
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	820 index,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	821 map->color.r, map->color.g, map->color.b, map->color.a);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	822 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	823 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	824 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	825 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	826 dmMsg(3, "Map index: %d -> %d\n",
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	827 map->from, map->to);
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	828
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	829 mapping[map->from] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	830 mapped[map->to] = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	831 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	832 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	833
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	834
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	835 // Fill in the rest
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	836 if (optRemapRemove)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	837 {
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	838 dmMsg(2, "Removing unused colors.\n");
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	839 for (index = 0; index < image->ncolors; index++)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	840 if (mapping[index] < 0 && used[index])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	841 {
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	842 for (n = 0; n < image->ncolors; n++)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	843 if (!mapped[n])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	844 {
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	845 mapping[index] = n;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	846 mapped[n] = TRUE;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	847 break;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	848 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	849 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	850 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	851 else
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	852 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	853 for (index = 0; index < image->ncolors; index++)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	854 if (mapping[index] < 0)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	855 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	856 for (n = 0; n < image->ncolors; n++)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	857 if (!mapped[n])
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	858 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	859 mapping[index] = n;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	860 mapped[n] = TRUE;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	861 break;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	862 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	863 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	864 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	865
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	866 // Calculate final number of palette colors
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	867 ncolors = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	868 for (index = 0; index < image->ncolors; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	869 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	870 if (mapping[index] + 1 > ncolors)
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	871 ncolors = mapping[index] + 1;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	872 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	873
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	874 // Copy palette entries
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	875 for (index = 0; index < image->ncolors; index++)
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	876 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	877 if (mapping[index] >= 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	878 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	879 memcpy(&npal[mapping[index]], &(image->pal[index]), sizeof(DMColor));
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	880 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	881 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	882
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	883 // Remap image
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	884 dmMsg(1, "Remapping image to %d colors...\n", ncolors);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	885 for (yc = 0; yc < image->height; yc++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	886 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	887 Uint8 dp = image->data + image->pitch yc;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	888 for (xc = 0; xc < image->width; xc++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	889 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	890 Uint8 col = dp[xc];
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	891 if (col < image->ncolors && mapping[col] >= 0 && mapping[col] < image->ncolors)
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	892 dp[xc] = mapping[col];
478 7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	893 else
7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	894 dp[xc] = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	895 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	896 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	897
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	898 // Set new palette, free memory
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	899 dmFree(image->pal);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	900 image->pal = npal;
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	901 image->ncolors = ncolors;
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	902
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	903 dmFree(mapping);
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	904 dmFree(mapped);
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	905 dmFree(used);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	906 return DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	907 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	908
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	909
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	910 int dmWriteImage(const char filename, DMImage image, DMImageSpec *spec, int iformat, BOOL info)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	912 if (info)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	914 dmMsg(1, "Outputting %s image %d x %d -> %d x %d [%d]\n",
446 a6d0e101cd16 Oops, correct the use of dmImageFormatList[] entry pointer to entry.fext. Matti Hamalainen <ccr@tnsp.org> parents: 443 diff changeset	915 dmImageFormatList[iformat].fext,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	916 image->width, image->height,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	917 image->width * spec->scale, image->height * spec->scale,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	918 spec->scale);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	919 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	920
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	921 // Perform color remapping
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	922 if (optRemapColors)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	923 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	924 int res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	925 if ((res = dmRemapImageColors(image)) != DMERR_OK)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	926 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	927 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	928
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	929 switch (iformat)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	930 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	931 #ifdef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	932 case IMGFMT_PNG:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	933 if (info) dmMsg(2, "%s output.\n", spec->paletted ? "Indexed 8bpp" : "32bit RGBA");
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	934 spec->format = spec->paletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	935 return dmWritePNGImage(filename, image, 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	936 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	938 case IMGFMT_PPM:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	939 if (info) dmMsg(2, "24bit RGB output.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	940 spec->format = DM_IFMT_RGB;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	941 return dmWritePPMImage(filename, image, 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	942
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	943 case IMGFMT_PCX:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	944 if (info) dmMsg(2, "%s output.\n", spec->paletted ? "Indexed 8bpp" : "24bit RGB");
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	945 return dmWritePCXImage(filename, image, 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	946
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	947 case IMGFMT_ARAW:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948 {
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	949 FILE *fp;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	950 char dataFilename, fext, *tmpFilename = dm_strdup(filename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	951
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	952 // Form data file filename
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	953 if (tmpFilename == NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	954 return DMERR_MALLOC;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	955
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	956 fext = strrchr(tmpFilename, '.');
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	957 if (fext != NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	958 *fext = 0;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	959 dataFilename = dm_strdup_printf("%s.inc", tmpFilename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	960 dmFree(tmpFilename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	961
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	962 // Open data file for writing
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	963 if ((fp = fopen(dataFilename, "w")) == NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	964 dmError("Could not create '%s'.\n", dataFilename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	965 dmFree(dataFilename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	966
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	967 if (fp != NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	968 {
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	969 // Strip extension
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	970 int i;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	971 char *palID = dm_strdup_printf("img_%s", filename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	972 char *fext = strrchr(palID, '.');
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	973 if (fext != NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	974 *fext = 0;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	975
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	976 // Replace any non-alphanumerics
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	977 for (i = 0; palID[i]; i++)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	978 {
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	979 if (isalnum(palID[i]))
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	980 palID[i] = tolower(palID[i]);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	981 else
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	982 palID[i] = '_';
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	983 }
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	984
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	985 fprintf(fp,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	986 "%s_width: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	987 "%s_height: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	988 "%s_nplanes: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	989 "%s_ncolors: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	990 "%s_palette:\n",
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	991 palID, image->width,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	992 palID, image->height,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	993 palID, spec->nplanes,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	994 palID, image->ncolors,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	995 palID);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	996
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	997 dmWriteIFFMasterRAWPalette(fp, image, 1 << optSpec.nplanes, NULL, NULL);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	998
477 0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	999 fprintf(fp,
0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1000 "%s: incbin \"%s\"\n",
0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1001 palID, filename);
0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1002
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1003 fclose(fp);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1004 dmFree(palID);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1005 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1006
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1007 if (info) dmMsg(2, "%d bitplanes, %s interleave.\n", spec->nplanes, spec->interleave ? "with" : "without");
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1008 return dmWriteIFFMasterRAWImage(filename, image, 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	1009 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1010
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1011 default:
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1012 return DMERR_INVALID_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	1013 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1014 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1016
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1017 Uint8 dmConvertByte(const Uint8 *sp, const BOOL multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1018 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1019 Uint8 byte = 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1020 int xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1021
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1022 if (multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1023 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1024 for (xc = 0; xc < 8 / 2; xc++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1025 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1026 Uint8 pixel = sp[xc * 2] & 3;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1027 byte \|= pixel << (6 - (xc * 2));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1028 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1029 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1030 else
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1031 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1032 for (xc = 0; xc < 8; xc++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1033 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1034 Uint8 pixel = sp[xc] == 0 ? 0 : 1;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1035 byte \|= pixel << (7 - xc);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1036 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1037 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1038
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1039 return byte;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1040 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1041
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1042
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1043 BOOL dmConvertImage2Char(Uint8 buf, const DMImage image,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1044 const int xoffs, const int yoffs, const BOOL multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1045 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1046 int yc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1047
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1048 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1049 xoffs + C64_CHR_WIDTH_PX > image->width \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1050 yoffs + C64_CHR_HEIGHT > image->height)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1051 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1052
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1053 for (yc = 0; yc < C64_CHR_HEIGHT; yc++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1054 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1055 const Uint8 sp = image->data + ((yc + yoffs) image->pitch) + xoffs;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1056 buf[yc] = dmConvertByte(sp, multicolor);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1057 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1058
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1059 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1060 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1061
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1062
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1063 BOOL dmConvertImage2Sprite(Uint8 buf, const DMImage image,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1064 const int xoffs, const int yoffs, const BOOL multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1065 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1066 int yc, xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1067
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1068 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1069 xoffs + C64_SPR_WIDTH_PX > image->width \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1070 yoffs + C64_SPR_HEIGHT > image->height)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1071 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1072
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1073 for (yc = 0; yc < C64_SPR_HEIGHT; yc++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1074 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1075 for (xc = 0; xc < C64_SPR_WIDTH_PX / C64_SPR_WIDTH; xc++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1076 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1077 const Uint8 sp = image->data + ((yc + yoffs) image->pitch) + (xc * 8) + xoffs;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1078 buf[(yc * C64_SPR_WIDTH) + xc] = dmConvertByte(sp, multicolor);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1079 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1080 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1081
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1082 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1083 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1084
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1085
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1086 int dmWriteSpritesAndChars(const char filename, DMImage image, int outFormat, BOOL multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1087 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1088 int outBlockW, outBlockH, bx, by;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1089 FILE *outFile = NULL;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1090 Uint8 *buf = NULL;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1091 char *outType;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1092 size_t bufSize;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1093
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1094 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1095 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1096 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1097 bufSize = C64_CHR_SIZE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1098 outBlockW = image->width / C64_CHR_WIDTH_PX;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1099 outBlockH = image->height / C64_CHR_HEIGHT;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1100 outType = "char";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1101 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1102
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1103 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1104 bufSize = C64_SPR_SIZE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1105 outBlockW = image->width / C64_SPR_WIDTH_PX;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1106 outBlockH = image->height / C64_SPR_HEIGHT;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1107 outType = "sprite";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1108 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1109
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1110 default:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1111 dmError("Invalid output format %d, internal error.\n", outFormat);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1112 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1113 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1114
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1115 if (outBlockW <= 0 \|\| outBlockH <= 0)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1116 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1117 dmError("Source image dimensions too small for conversion, block dimensions %d x %d.\n",
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1118 outBlockW, outBlockH);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1119 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1120 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1121
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1122 if ((outFile = fopen(filename, "wb")) == NULL)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1123 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1124 int err = dmGetErrno();
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1125 dmError("Could not open '%s' for writing, %d: %s.\n",
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1126 filename, err, dmErrorStr(err));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1127 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1128 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1129
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1130 if ((buf = dmMalloc(bufSize)) == NULL)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1131 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1132 dmError("Could not allocate %d bytes for conversion buffer.\n",
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1133 bufSize);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1134 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1135 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1136
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1137 dmMsg(1, "Writing %d x %d = %d blocks of %s data...\n",
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1138 outBlockW, outBlockH, outBlockW * outBlockH, outType);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1139
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1140 for (by = 0; by < outBlockH; by++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1141 for (bx = 0; bx < outBlockW; bx++)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1142 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1143 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1144 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1145 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1146 if (!dmConvertImage2Char(buf, image,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1147 bx * C64_CHR_WIDTH_PX, by * C64_CHR_HEIGHT,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1148 multicolor))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1149 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1150 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1151
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1152 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1153 if (!dmConvertImage2Sprite(buf, image,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1154 bx * C64_SPR_WIDTH_PX, by * C64_SPR_HEIGHT,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1155 multicolor))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1156 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1157 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1158
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1159 if (!dm_fwrite_str(outFile, buf, bufSize))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1160 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1161 int err = dmGetErrno();
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1162 dmError("Error writing data block %d,%d to '%s', %d: %s\n",
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1163 bx, by, filename, err, dmErrorStr(err));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1164 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1165 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1166 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1167
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1168 fclose(outFile);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1169 dmFree(buf);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1170 return 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1171
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1172 error:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1173 if (outFile != NULL)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1174 fclose(outFile);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1175 dmFree(buf);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1176 return -1;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1177 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1178
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1179 int dmDumpSpritesAndChars(FILE *inFile)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1180 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1181 int dataOffs, itemCount, outWidth, outWidthPX, outHeight;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1182 size_t bufSize;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1183 Uint8 *bufData;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1184
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1185 switch (optInFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1186 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1187 case FFMT_CHAR:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1188 bufSize = C64_CHR_SIZE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1189 outWidth = C64_CHR_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1190 outWidthPX = C64_CHR_WIDTH_PX;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1191 outHeight = C64_CHR_HEIGHT;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1192 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1193
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1194 case FFMT_SPRITE:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1195 bufSize = C64_SPR_SIZE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1196 outWidth = C64_SPR_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1197 outWidthPX = C64_SPR_WIDTH_PX;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1198 outHeight = C64_SPR_HEIGHT;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1199 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1200
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1201 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1202 dmError("Invalid input format %d, internal error.\n", optInFormat);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1203 return -1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1204 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1205
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1206 if ((bufData = dmMalloc(bufSize)) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1207 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1208 dmError("Could not allocate temporary buffer of %d bytes.\n", bufSize);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1209 return -2;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1210 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1212
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1213 dataOffs = optInSkip;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1214 itemCount = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1215
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1216 if (optOutFormat == FFMT_ANSI \|\| optOutFormat == FFMT_ASCII)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1217 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1218 BOOL error = FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1219 FILE *outFile;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1220
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1221 if (optOutFilename == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1222 outFile = stdout;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1223 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1224 if ((outFile = fopen(optOutFilename, "w")) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1225 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1226 int res = dmGetErrno();
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1227 dmError("Error opening output file '%s', %d: %s\n",
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1228 optOutFilename, res, dmErrorStr(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	1229 goto error;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1230 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1231
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1232 while (!feof(inFile) && !error && (optItemCount < 0 \|\| itemCount < optItemCount))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1233 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234 memset(bufData, 0, bufSize);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1235
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1236 if (fread(bufData, 1, bufSize, inFile) != bufSize)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1238 dmError("Could not read full bufferful (%d bytes) of data at 0x%x.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 bufSize, dataOffs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240 error = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1241 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1242
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1243 fprintf(outFile, "---- : -------------- #%d\n", itemCount);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1244
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1245 switch (optInFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1246 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1247 case FFMT_CHAR:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248 dmDumpCharASCII(outFile, bufData, &dataOffs, optOutFormat, optInMulticolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1249 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1250 case FFMT_SPRITE:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1251 dmDumpSpriteASCII(outFile, bufData, &dataOffs, optOutFormat, optInMulticolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1252 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1253 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1254 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257 fclose(outFile);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1258 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259 else
423 11b3adb3bdb1 Fix image format output. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1260 if (optOutFormat == FFMT_IMAGE)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1261 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262 DMImage *outImage = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263 char *outFilename = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1264 int outX = 0, outY = 0, err;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1265
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1266 if (optSequential)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1267 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1268 if (optOutFilename == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1269 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1270 dmError("Sequential image output requires filename template.\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1271 goto error;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1272 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1273
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1274 outImage = dmImageAlloc(outWidthPX, outHeight);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1275 dmMsg(1, "Outputting sequence of %d images @ %d x %d -> %d x %d.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1276 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1277 outImage->width, outImage->height,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1278 outImage->width * optSpec.scale, outImage->height * optSpec.scale);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1279 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1280 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1281 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1282 int outIWidth, outIHeight;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1283 if (optItemCount <= 0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1284 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1285 dmError("Single-image output requires count to be set (-n).\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1286 goto error;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1287 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1288
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1289 outIWidth = optPlanedWidth;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1290 outIHeight = (optItemCount / optPlanedWidth);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1291 if (optItemCount % optPlanedWidth)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1292 outIHeight++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1293
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1294 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1295 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1296
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1297 outImage->constpal = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1298 outImage->pal = dmC64Palette;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1299 outImage->ncolors = C64_NCOLORS;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 457 diff changeset	1300 outImage->ctransp = 255;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1301
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1302 while (!feof(inFile) && (optItemCount < 0 \|\| itemCount < optItemCount))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1303 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1304 memset(bufData, 0, bufSize);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1306 if (fread(bufData, 1, bufSize, inFile) != bufSize)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1308 dmError("Could not read full bufferful (%d bytes) of data at 0x%x.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1309 bufSize, dataOffs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1310 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1311 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1312
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1313 if ((err = dmC64ConvertCSData(outImage, outX * outWidthPX, outY * outHeight,
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1314 bufData, outWidth, outHeight, optInMulticolor, optColors)) != 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	1315 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1316 dmError("Internal error in conversion of raw data to bitmap: %d.\n", err);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1317 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1318 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1319
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1320 if (optSequential)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1321 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1322 outFilename = dm_strdup_printf("%s%04d.%s", optOutFilename, itemCount, convFormatList[optOutFormat].fext);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1323 if (outFilename == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1324 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 dmError("Could not allocate memory for filename template?\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1326 goto error;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1327 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1328
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1329 dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1330 dmFree(outFilename);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1331 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1332 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1333 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1334 if (++outX >= optPlanedWidth)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1335 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1336 outX = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1337 outY++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1340
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1341 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1342 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1343
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1344 if (!optSequential)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1345 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1346 dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1347 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1348
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1349 dmImageFree(outImage);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1350 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1351
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1352 dmFree(bufData);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1353 return 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1354
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1355 error:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1356 dmFree(bufData);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1357 return -1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1358 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1359
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1360
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1361 int main(int argc, char *argv[])
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1362 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1363 FILE *inFile;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1364 DMC64ImageFormat *cfmt;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1365 DMC64Image cimage;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1366 Uint8 *dataBuf = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1367 size_t dataSize;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1368 int 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	1369
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1370 // Default colors
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1371 for (i = 0; i < C64_MAX_COLORS; i++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1372 optColors[i] = 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	1373
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1374 // Initialize and parse commandline
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1375 dmInitProg("gfxconv", "Simple graphics converter", "0.6", NULL, NULL);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1376
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1377 if (!dmArgsProcess(argc, argv, optList, optListN,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1378 argHandleOpt, argHandleFile, TRUE))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1379 exit(1);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1380
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1381 #ifndef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1382 if (optOutFormat == IMGFMT_PNG)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1383 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1384 dmError("PNG output format support not compiled in, sorry.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1385 goto error;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1386 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1387 #endif
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1388
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1389 // Determine input format, if not specified'
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1390 if (optInFormat == FFMT_AUTO && optInFilename != NULL)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1391 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1392 char *dext = strrchr(optInFilename, '.');
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1393 dmMsg(4, "Trying to determine file format by extension.\n");
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1394 if (dext)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1395 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1396 dmGetFormatByExt(dext + 1, &optInFormat, &optInSubFormat);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1397 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1398 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1399
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1400 if (optInFilename == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1401 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1402 if (optInFormat == FFMT_AUTO)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1403 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1404 dmError("Standard input cannot be used without specifying input format.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1405 goto error;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1406 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1407 inFile = stdin;
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 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1410 if ((inFile = fopen(optInFilename, "rb")) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1411 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1412 int res = dmGetErrno();
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1413 dmError("Error opening input file '%s', %d: %s\n",
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1414 optInFilename, res, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1415 goto error;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1416 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1417
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1418 if (dmReadDataFile(inFile, NULL, &dataBuf, &dataSize) != 0)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1419 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1420
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1421 if (optInFormat == FFMT_AUTO \|\| optInFormat == FFMT_BITMAP)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1422 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1423 // Probe for format
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1424 DMC64ImageFormat *forced = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1425 int res;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1426
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1427 if (optForcedFormat >= 0)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1428 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1429 forced = &dmC64ImageFormats[optForcedFormat];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1430 dmMsg(0,"Forced %s format image, type %d, %s\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1431 forced->name, forced->type, forced->extension);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1432 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1433
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1434 res = dmC64DecodeBMP(&cimage, dataBuf, dataSize, optInSkip, optInSkip + 2, &cfmt, forced);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1435 if (forced == NULL && cfmt != NULL)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1436 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1437 dmMsg(1,"Probed %s format image, type %d, %s\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1438 cfmt->name, cfmt->type, cfmt->extension);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1439 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1440
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1441 if (res == 0)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1442 optInFormat = FFMT_BITMAP;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1443 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1444
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1445 if (optInFormat == FFMT_AUTO \|\| optInFormat == FFMT_IMAGE)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1446 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1447 DMImageFormat *ifmt = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1448 int index;
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1449 dmMsg(4, "Trying to probe image formats.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1450 if (dmImageProbeGeneric(dataBuf + optInSkip, dataSize - optInSkip, &ifmt, &index) > 0)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1451 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1452 optInFormat = FFMT_IMAGE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1453 optInSubFormat = index;
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1454 dmMsg(2, "Probed %s format image.\n", ifmt->fext);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1455 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1456 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1457
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1458 if (optInFormat == FFMT_AUTO)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1459 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1460 dmError("No input format specified, and could not be determined automatically.\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1461 exit(1);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1462 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1463
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1464 // Skip, if needed
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1465 if (fseek(inFile, optInSkip, SEEK_SET) != 0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1466 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1467 int res = dmGetErrno();
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1468 dmError("Could not seek to file position %d (0x%x): %s\n",
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1469 optInSkip, optInSkip, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1470 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1471 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1472
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1473 int inFormat = dmGetConvFormat(optInFormat, optInSubFormat),
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1474 outFormat = dmGetConvFormat(optOutFormat, optOutSubFormat);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1475
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1476 if (inFormat != -1 && outFormat != -1)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1477 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1478 char *inFmtName = convFormatList[inFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1479 *inFmtExt = convFormatList[inFormat].fext,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1480 *outFmtName = convFormatList[outFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1481 *outFmtExt = convFormatList[outFormat].fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1482
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1483 if (optInFormat == FFMT_BITMAP)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1484 inFmtExt = cfmt->name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1485
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1486 dmMsg(1, "Attempting conversion %s (%s) -> %s (%s)\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1487 inFmtName, inFmtExt, outFmtName, outFmtExt);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1488 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1489
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1490 switch (optInFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1491 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1492 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1493 case FFMT_CHAR:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1494 dmDumpSpritesAndChars(inFile);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1495 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1496
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1497 case FFMT_BITMAP:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1498 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1499 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1500 int res = 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	1501
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1502 if (optOutFilename == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1503 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1504 dmError("Output filename not set, required for image formats.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1505 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1506 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1507
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1508 switch (optOutFormat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1509 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1510 case FFMT_IMAGE:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1511 if ((outImage = dmImageAlloc(C64_SCR_WIDTH, C64_SCR_HEIGHT)) == NULL)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1512 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1513 dmError("Could not allocate output image surface %d x %d.\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1514 C64_SCR_WIDTH, C64_SCR_HEIGHT);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1515 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1516 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1517
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1518 outImage->pal = (DMColor *) &dmC64Palette;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1519 outImage->ncolors = C64_NCOLORS;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1520 outImage->constpal = TRUE;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1521
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1522 if (cfmt->convert != NULL)
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1523 res = cfmt->convert(outImage, &cimage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1524 else
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1525 res = dmC64ConvertGenericBMP2Image(outImage, &cimage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1526
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1527 if (res != DMERR_OK \|\| outImage == NULL)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1528 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1529 dmError("Error in bitmap to image conversion.\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1530 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1531 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1532
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1533 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1534 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1535
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1536 default:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1537 dmError("Unsupported output format for bitmap/image conversion.\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1538 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1539 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1540
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1541 dmImageFree(outImage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1542 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1543 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1544
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1545 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1546 {
441 2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1547 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1548 int res = DMERR_OK;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1549
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1550 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1551 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1552 dmError("Output filename not set, required for image formats.\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1553 goto error;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1554 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1555
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1556 // Read input
441 2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1557 DMImageFormat *ifmt = &dmImageFormatList[optInSubFormat];
2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1558 if (ifmt->readFILE != NULL)
2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1559 res = ifmt->readFILE(inFile, &outImage);
2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1560 else
2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1561 dmError("Unsupported input image format for bitmap/image conversion.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1562
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1563 if (res != DMERR_OK \|\| outImage == NULL)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1564 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	1565
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1566 switch (optOutFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1567 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1568 case FFMT_IMAGE:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1569 res = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1570 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1571
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1572 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1573 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1574 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1575 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1576
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1577 default:
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1578 dmError("Unsupported output format for bitmap/image conversion.\n");
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1579 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	1580 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1581
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1582 dmImageFree(outImage);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1583 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1584 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1585 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1586
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1587 fclose(inFile);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1588
466 0bfa6a15bb46 Plug (non-dangerous) memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1589 dmFree(dataBuf);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1590 exit(0);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1591 return 0;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1592
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1593 error:
466 0bfa6a15bb46 Plug (non-dangerous) memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1594 dmFree(dataBuf);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1595 return -3;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1596 exit(3);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1597 }

Mercurial > hg > dmlib

annotate gfxconv.c @ 489:fca3c240ccac