dmlib: tools/gfxconv.c annotate

annotate tools/gfxconv.c @ 827:c8beac5313c3

Rename a function.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 17 May 2014 00:29:16 +0300
parents	742e3d850247
children	c20a99411a1a

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
825 c5b768c8e641 Update copyright. Matti Hamalainen <ccr@tnsp.org> parents: 824 diff changeset	4 * (C) Copyright 2012-2014 Tecnic Software productions (TNSP)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	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 },
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	75 {
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	76 "Bitplaned RAW (intl/non-intl) image file", "raw", FALSE, TRUE,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	77 FFMT_IMAGE , IMGFMT_RAW,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	78 },
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	79 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	80 "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	81 FFMT_IMAGE , IMGFMT_ARAW,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	82 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	83
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	84 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	85 "C64 bitmap image file", NULL, TRUE, TRUE,
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	86 FFMT_BITMAP , -1,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	87 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	88
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	89 {
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	90 "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	91 FFMT_CHAR , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	92 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	93 {
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	94 "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	95 FFMT_SPRITE , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	96 },
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
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	99 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	100
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	102 typedef struct
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	103 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	104 BOOL triplet, alpha;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	105 DMColor color;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	106 int from, to;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	107 } DMMapValue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	108
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 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	112 *optOutFilename = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	113 int optInFormat = FFMT_AUTO,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	114 optOutFormat = FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	115 optInSubFormat = IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	116 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	117 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	118 optPlanedWidth = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	119 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	120 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	121 BOOL optInMulticolor = FALSE,
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	122 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	123 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	124 optRemapRemove = FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	125 int optNRemapTable = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	126 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	127 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	128
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	129 DMImageSpec optSpec =
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	130 {
457 9a5ceedf0972 Set default scaling to 1. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	131 .scale = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	132 .nplanes = 4,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	133 .interleave = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	134 .paletted = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	135 .format = 0,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	136 };
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 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	139 {
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	140 { 0, '?', "help", "Show this help", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	141 { 15, 'v', "verbose", "Increase verbosity", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	142 { 3, 'o', "output", "Output filename", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	143 { 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	144 { 2, 'm', "multicolor", "Input is multicolor / output in multicolor", OPT_NONE },
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	145 { 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	146 { 5, 'f', "format", "Output format (see --formats)", OPT_ARGREQ },
822 b034c1457aa5 Remove -F, leave only --formats option. Matti Hamalainen <ccr@tnsp.org> parents: 821 diff changeset	147 { 17, 0 , "formats", "List available input/output formats", OPT_NONE },
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	148 { 8, 'q', "sequential", "Output sequential files (image output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	149 { 6, 'c', "colormap", "Color mappings (see below for information)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	150 { 7, 'n', "numitems", "How many 'items' to view (default: all)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	151 { 9, 'S', "scale", "Scale output by x (image output only)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	152 { 10, 'b', "bformat", "Force input bitmap format (see below)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	153 { 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	154 { 12, 'P', "paletted", "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	155 { 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	156 { 14, 'I', "interleave", "Interleave scanlines (default: output whole planes)", OPT_NONE },
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	157 { 16, 'R', "remap", "Remap output image colors (-R <(#RRGGBB\|index):index>[,<..>][+remove] \| -R @map.txt[+remove])", OPT_ARGREQ },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 };
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 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	161
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	163 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	164 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 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	166
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	167 printf(
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	168 "Available input/output formats:\n"
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	169 " Ext \| I \| O \| Description\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	170 "------+---+---+-----------------------------------------------\n"
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	171 );
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	172
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	173 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	174 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	175 DMConvFormat *fmt = &convFormatList[i];
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	176 printf("%-5s \| %c \| %c \| %s\n",
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	177 fmt->fext ? fmt->fext : "",
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	178 fmt->in ? 'X' : ' ',
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	179 fmt->out ? 'X' : ' ',
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	180 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	181 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	183 printf(
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	184 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	185 "(Not all input->output combinations are actually supported.)\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	186 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	187 "Available bitmap formats:\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	188 " Ext \| Type \| Description\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	189 "------+-----------------+-------------------------------------\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	190 );
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	191
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 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	193 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	194 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	195 char buf[64];
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	196 printf("%-5s \| %-15s \| %s\n",
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	197 fmt->fext,
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	198 dmC64GetImageTypeString(buf, sizeof(buf), fmt->type),
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 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	200 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	201 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	202
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	203
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	204 void argShowHelp()
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	205 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	206 dmPrintBanner(stdout, dmProgName, "[options] <input file>");
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	207 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	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 printf(
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	210 "Palette / color remapping (-R)\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	211 "------------------------------\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	212 "Indexed palette/color remapping can be performed via the -R option, either\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	213 "specifying single colors or filename of file containing remap definitions.\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	214 "Colors to be remapped can be specified either by their palette index or by\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	215 "their RGB values as a hex triplet (#rrggbb). Example of a remap definition:\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	216 "-R #000000:0,#ffffff:1 would remap black and white to indices 0 and 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	217 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	218 "Remap file is specified as -R @filename, and it is a plan text file with\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	219 "one remap definition per line. All empty lines and lines starting with a\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	220 "semicolor (;) will be ignored. Whitespace separating items is ignored, too.\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	221 "\n"
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	222 "Optional +remove can be specified (-R <...>+remove), which will remove all\n"
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	223 "unused colors from the palette. This is not usually desirable, for example\n"
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	224 "when converting multiple images to same palette.\n"
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	225 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	226 "Color map defs\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	227 "--------------\n"
456 20122cffde2f Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	228 "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	229 "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	230 "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	231 "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	232 "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	233 "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	234 "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	235 );
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	239 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	240 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	241 int i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	242 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	243 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	244 DMConvFormat *fmt = &convFormatList[i];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	245 if (fmt->format == format &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	246 fmt->subformat == subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	247 return i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	248 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	249 return -1;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	250 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	251
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	252
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	253 BOOL dmGetC64FormatByExt(const char fext, int format, int *subformat)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	254 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	255 int i;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	256 if (fext == NULL)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	257 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	258
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	259 for (i = 0; i < ndmC64ImageFormats; i++)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	260 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	261 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	262 if (fmt->fext != NULL &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	263 strcasecmp(fext, fmt->fext) == 0)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	264 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	265 *format = FFMT_BITMAP;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	266 *subformat = i;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	267 return TRUE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	268 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	269 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	270
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	271 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	272 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	273
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	274
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	275
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	276 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	277 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	278 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	279 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	280 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	281
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	282 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	283 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	284 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	285 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	286 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	287 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	288 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	289 *subformat = fmt->subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	290 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	291 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	292 }
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	293
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	294 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	295 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	296
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	297
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	298 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	299 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	300 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	301
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	302 if (opt == NULL)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	303 goto error;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	304
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	305 if ((end = split = strchr(opt, ':')) == NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	306 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	307 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	308 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	309 }
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 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	312 *end = 0;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	313 for (end--; end > opt && end && isspace(end); end--)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	314 *end = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	315
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	316 // 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	317 if (opt == '#' \|\| opt == '%')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	318 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	319 int colR, colG, colB, colA;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	320
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	321 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	322 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	323 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	324 value->alpha = TRUE;
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	325 value->color.a = colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	326 }
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	327 else
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	328 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	329 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	330 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	331 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	332 goto error;
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	333 }
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	334
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	335 value->color.r = colR;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	336 value->color.g = colG;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	337 value->color.b = colB;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	338 value->triplet = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	339 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	340 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	341 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	342 if (!dmGetIntVal(opt, &value->from))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	343 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	344 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	345 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	346 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	347 value->triplet = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	348 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	349
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	350 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	351 split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	352 while (split && isspace(split)) split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	353
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	354 // Parse destination value
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	355 if (!dmGetIntVal(split, &value->to))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	356 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	357 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	358 goto error;
473 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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	361 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	362 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	363 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	364 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	365 }
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 if (value->to < 0 \|\| value->to > nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	368 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	369 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	370 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	371 }
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	372
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	373 dmFree(opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	374 return TRUE;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	375
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	376 error:
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	377 dmFree(opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	378 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	379 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	380
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 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	383 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	384 // Trim whitespace
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	385 if (end != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	386 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	387 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	388 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	389 *end = 0;
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 while (opt && isspace(opt)) opt++;
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 // Parse item based on mode
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	394 if (requireIndex)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	395 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	396 DMMapValue value = (DMMapValue ) pvalue;
475 c0dedfef3edf Fix option parsing of mappings. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	397 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	398 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	399 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	400 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	401 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	402 int value = (int ) pvalue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	403 char *split = strchr(opt, ':');
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	404 if (split != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	405 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	406 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	407 return FALSE;
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	410 if (!dmGetIntVal(opt, &value[index]))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	411 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	412 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	413 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	414 }
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	417 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	418 }
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	421 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	422 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	423 char end, start = opt;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	424
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	425 *nvalues = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	426 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	427 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	428 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	429 return FALSE;
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 start = end + 1;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	432 (*nvalues)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	433 }
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 if (start && nvalues < nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	436 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	437 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	438 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	439
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	440 (*nvalues)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	441 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	442
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	443 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	444 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	445
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	446
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	447 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	448 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	449 FILE *fp;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	450 char line[512];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	451 int res = DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	452
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	453 if ((fp = fopen(filename, "r")) == NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	454 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	455 res = dmGetErrno();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	456 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	457 res, dmErrorStr(res));
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	458 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	459 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	460
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	461 while (fgets(line, sizeof(line), fp))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	462 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	463 char *start = line;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	464 while (start && isspace(start)) start++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	465
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	466 if (start != 0 && start != ';')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	467 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	468 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	469 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	470 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	471 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	472 (*nvalue)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	473 if (*nvalue >= nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	474 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	475 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	476 filename, nmax);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	477 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	478 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	479 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	480 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	481 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	482
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	483 error:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	484 fclose(fp);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	485 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	486 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	487
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	488
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 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	490 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 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	492 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 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	494 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 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	496 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	498 case 17:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	499 argShowFormats();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	500 exit(0);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	501 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	502
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	503 case 15:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	504 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	505 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	506
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 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	508 {
824 705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	509 switch (tolower(optArg[0]))
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	510 {
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	511 case 's': optInFormat = FFMT_SPRITE; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	512 case 'c': optInFormat = FFMT_CHAR; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	513 case 'b': optInFormat = FFMT_BITMAP; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	514 case 'i': optInFormat = FFMT_IMAGE; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	515 default:
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	516 dmError("Invalid input format '%s'.\n", optArg);
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	517 return FALSE;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	518 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 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	523 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	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 3:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 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	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 4:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 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	532 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533 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	534 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	535 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 case 5:
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	539 if (!dmGetFormatByExt(optArg, &optOutFormat, &optOutSubFormat) &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	540 !dmGetC64FormatByExt(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	541 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	542 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	543 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	544 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 break;
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 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	548 {
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	549 int index, ncolors;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	550 if (!dmParseMapOptionString(optArg, optColors,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	551 &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	552 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	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 dmMsg(1, "Set color table: ");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	555 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	556 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 dmPrint(1, "[%d:%d]%s",
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	558 index, optColors[index],
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	559 (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	560 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 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	562 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 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	566 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	567 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 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	569 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	570 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 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	574 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	575 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577 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	578 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 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	580 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	581 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 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	583 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	584 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	585 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	586 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 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	590 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 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	592 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	593 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 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	595 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	596 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 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	598 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 case 12:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	602 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	603 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	605 case 13:
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	606 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	607 int tmp = atoi(optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	608 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	609 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	610 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	611 return FALSE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	612 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	613 optSpec.nplanes = tmp;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	614 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	615 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	616
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	617 case 14:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	618 optSpec.interleave = TRUE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	619 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	620
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	621
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	622 case 16:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	623 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	624 char *tmp;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	625 if ((tmp = dm_strrcasecmp(optArg, "+remove")) != NULL)
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	626 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	627 optRemapRemove = TRUE;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	628 *tmp = 0;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	629 }
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	630
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	631 if (optArg[0] == '@')
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	632 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	633 if (optArg[1] != 0)
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	634 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	635 int res;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	636 if ((res = dmParseColorRemapFile(optArg + 1,
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	637 optRemapTable, &optNRemapTable, DM_MAX_COLORS)) != DMERR_OK)
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	638 return FALSE;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	639 }
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	640 else
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	641 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	642 dmError("No remap filename given.\n");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	643 return FALSE;
823 f0429dbd77ec Oops, missing } from one of the previous commits. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 822 diff changeset	644 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	645 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	646 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	647 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	648 if (!dmParseMapOptionString(optArg, optRemapTable,
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	649 &optNRemapTable, DM_MAX_COLORS, TRUE, "color remap option"))
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	650 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	651 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	652 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	653
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	654 optRemapColors = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	655 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	656
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 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	659 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	660 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 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	663 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 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	667 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 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	669 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	670 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 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	673 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 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	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 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	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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 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	682 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 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	684
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 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	686 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687 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	688 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 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	690 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	691 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	692 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	693 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	694 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	695 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	696 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	697 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	698 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	699 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 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	702 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	708 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709 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	710 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 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	712 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	713 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	714 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	715 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	716 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	717 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	718 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	719 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	720 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	721 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	723 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	724 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 }
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 }
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	732 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	733 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 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	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 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	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 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	739 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	740 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	741 (*offs)++;
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	746 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	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 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	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 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	751 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 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	753 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	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 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	756 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	757 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 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	761 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	762 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	766 int dmRemapImageColors(DMImage *image)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	767 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	768 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	769 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	770 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	771 BOOL used = dmMalloc(image->ncolors sizeof(BOOL));
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	772 int n, index, xc, yc, ncolors;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	773
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	774 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	775
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 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	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 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	779 return DMERR_MALLOC;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	780 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	781
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	782 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	783 {
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 mapping[index] = -1;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	785 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	786 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 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 // 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	789 dmMsg(2, "Scanning image for used colors...\n");
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	790 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	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 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	793 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	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 Uint8 col = dp[xc];
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	796 if (col < image->ncolors && !used[col])
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	797 {
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	798 used[col] = TRUE;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	799 ncolors++;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	800 }
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	801 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	802 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	803 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	804
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	805 // Match and mark mapped colors
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	806 for (index = 0; index < optNRemapTable; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	807 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	808 DMMapValue *map = &optRemapTable[index];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	809 if (map->triplet)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	810 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	811 BOOL found = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	812 for (n = 0; n < image->ncolors; n++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	813 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	814 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	815 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	816 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	817 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	818 n,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	819 map->to);
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	820
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	821 mapping[n] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	822 mapped[map->to] = TRUE;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	823 found = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	824 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	825 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	826
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	827 if (!found)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	828 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	829 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	830 index,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	831 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	832 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	833 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	834 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	835 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	836 dmMsg(3, "Map index: %d -> %d\n",
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	837 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	838
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	839 mapping[map->from] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	840 mapped[map->to] = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	841 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	842 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	843
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	844
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	845 // 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	846 if (optRemapRemove)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	847 {
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	848 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	849 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	850 if (mapping[index] < 0 && used[index])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	851 {
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	852 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	853 if (!mapped[n])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	854 {
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	855 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	856 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	857 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	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 }
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 }
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 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	862 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	863 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	864 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	865 {
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 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	867 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	868 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	869 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	870 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	871 break;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	872 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	873 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	874 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	875
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 // 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	877 ncolors = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	878 for (index = 0; index < image->ncolors; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	879 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	880 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	881 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	882 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	883
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 // Copy palette entries
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	885 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	886 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	887 if (mapping[index] >= 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	888 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	889 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	890 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	891 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	892
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	893 // 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	894 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	895 for (yc = 0; yc < image->height; yc++)
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 Uint8 dp = image->data + image->pitch yc;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	898 for (xc = 0; xc < image->width; xc++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	899 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	900 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	901 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	902 dp[xc] = mapping[col];
478 7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	903 else
7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	904 dp[xc] = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	905 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	906 }
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 // Set new palette, free memory
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	909 dmFree(image->pal);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	910 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	911 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	912
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	913 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	914 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	915 dmFree(used);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	916 return DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	917 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	918
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	919
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	920 int dmWriteBitmap(const char filename, DMC64Image image, int iformat, BOOL enableFixUps)
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	921 {
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	922 FILE *outFile = NULL;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	923 Uint8 *buf = NULL;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	924 size_t bufSize;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	925 int res = DMERR_OK;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	926 const DMC64ImageFormat *fmt = &dmC64ImageFormats[iformat];
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	927
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	928 dmMsg(1, "Converting to %s format bitmap.\n", fmt->name);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	929 if (image->type != fmt->type && enableFixUps)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	930 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	931 // Try to do some simple fixups
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	932 if ((fmt->type & D64_FMT_FLI) && (image->type & D64_FMT_FLI) == 0)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	933 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	934 dmMsg(1, "Upconverting multicolor to FLI.\n");
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	935 int i;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	936 for (i = 1; i < C64_SCR_MAX_BANK; i++)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	937 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	938 memcpy(image->color[i], image->color[0], C64_SCR_COLOR_SIZE);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	939 memcpy(image->screen[i], image->screen[0], C64_SCR_SCREEN_SIZE);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	940 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	941 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	942 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	943
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	944
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	945 if ((res = dmC64EncodeGenericBMP(&buf, &bufSize, image, fmt)) != DMERR_OK)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	946 goto error;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	947
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	948 dmMsg(2, "Result: %d bytes\n", bufSize);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	949
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	950 if ((outFile = fopen(filename, "wb")) == NULL)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	951 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	952 res = dmGetErrno();
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	953 dmError("Error opening output file '%s', %d: %s\n",
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	954 filename, res, dmErrorStr(res));
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	955 goto error;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	956 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	957
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	958 if (!dm_fwrite_str(outFile, buf, bufSize))
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	959 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	960 res = dmGetErrno();
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	961 dmError("Error writing image data to '%s', %d: %s\n",
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	962 filename, res, dmErrorStr(res));
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	963 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	964
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	965 error:
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	966 if (outFile != NULL)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	967 fclose(outFile);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	968 dmFree(buf);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	969 return res;
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	970 }
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	971
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	972
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	973 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	974 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	975 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	976 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	977 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	978 dmImageFormatList[iformat].fext,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	979 image->width, image->height,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	980 image->width * spec->scale, image->height * spec->scale,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	981 spec->scale);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	982 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	983
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	984 // Perform color remapping
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	985 if (optRemapColors)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	986 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	987 int res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	988 if ((res = dmRemapImageColors(image)) != DMERR_OK)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	989 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	990 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	991
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	992 switch (iformat)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	993 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	994 #ifdef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	995 case IMGFMT_PNG:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	996 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	997 spec->format = spec->paletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	998 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	999 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1000
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1001 case IMGFMT_PPM:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1002 if (info) dmMsg(2, "24bit RGB output.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1003 spec->format = DM_IFMT_RGB;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1004 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	1005
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1006 case IMGFMT_PCX:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1007 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	1008 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	1009
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1010 case IMGFMT_RAW:
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1011 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	1012 {
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1013 FILE *fp;
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1014 char *dataFilename;
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1015
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1016 // Form data file filename
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1017 dataFilename = dm_strdup_fext(filename, "%s.inc");
e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1018 if (dataFilename == NULL)
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1019 return DMERR_MALLOC;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1020
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1021 // Open data file for writing
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1022 if ((fp = fopen(dataFilename, "w")) == NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1023 dmError("Could not create '%s'.\n", dataFilename);
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1024
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1025 dmFree(dataFilename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1026
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1027 if (fp != NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1028 {
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1029 // Strip extension
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1030 int i;
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1031 char *palID = dm_strdup_fext(filename, "img_%s");
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1032
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1033 // Replace any non-alphanumerics
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1034 for (i = 0; palID[i]; i++)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1035 {
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1036 if (isalnum(palID[i]))
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1037 palID[i] = tolower(palID[i]);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1038 else
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1039 palID[i] = '_';
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1040 }
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1041
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1042 if (iformat == IMGFMT_ARAW)
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1043 {
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1044 fprintf(fp,
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1045 "%s_width: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1046 "%s_height: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1047 "%s_nplanes: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1048 "%s_ncolors: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1049 "%s_palette:\n",
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1050 palID, image->width,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1051 palID, image->height,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1052 palID, spec->nplanes,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1053 palID, image->ncolors,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1054 palID);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1055
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1056 dmWriteIFFMasterRAWPalette(fp, image, 1 << optSpec.nplanes, NULL, NULL);
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1057
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1058 fprintf(fp,
477 0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1059 "%s: incbin \"%s\"\n",
0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1060 palID, filename);
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1061 }
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1062 else
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1063 {
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1064 fprintf(fp,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1065 "%s_width: dw.w %d\n"
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1066 "%s_height: dw.w %d\n"
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1067 "%s_nplanes: dw.w %d\n",
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1068 palID, image->width,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1069 palID, image->height,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1070 palID, spec->nplanes);
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1071 }
477 0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1072
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1073 fclose(fp);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1074 dmFree(palID);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1075 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1076
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1077 if (info) dmMsg(2, "%d bitplanes, %s interleave.\n", spec->nplanes, spec->interleave ? "with" : "without");
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1078 return dmWriteRAWImage(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	1079 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1080 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	1081
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1082 default:
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1083 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	1084 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1085 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1086
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1087
547 ca5ad51c6479 Make dmConvertByte() static. Matti Hamalainen <ccr@tnsp.org> parents: 546 diff changeset	1088 static Uint8 dmConvertByte(const Uint8 *sp, const BOOL multicolor)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1089 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1090 Uint8 byte = 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1091 int xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1092
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1093 if (multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1094 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1095 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	1096 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1097 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	1098 byte \|= pixel << (6 - (xc * 2));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1099 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1100 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1101 else
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 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	1104 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1105 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	1106 byte \|= pixel << (7 - xc);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1107 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1108 }
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 return byte;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1111 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1112
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 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	1115 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	1116 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1117 int yc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1118
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1119 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1120 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	1121 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	1122 return FALSE;
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 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	1125 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1126 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	1127 buf[yc] = dmConvertByte(sp, multicolor);
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 return TRUE;
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
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1133
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1134 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	1135 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	1136 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1137 int yc, xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1138
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1139 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1140 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	1141 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	1142 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1143
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1144 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	1145 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1146 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	1147 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1148 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	1149 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	1150 }
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
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1153 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1154 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1155
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1156
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1157 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	1158 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1159 int outBlockW, outBlockH, bx, by;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1160 FILE *outFile = NULL;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1161 Uint8 *buf = NULL;
546 e74a0e027681 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 534 diff changeset	1162 size_t bufSize;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1163 char *outType;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1164
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1165 switch (outFormat)
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 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1168 bufSize = C64_CHR_SIZE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1169 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	1170 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	1171 outType = "char";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1172 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1173
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1174 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1175 bufSize = C64_SPR_SIZE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1176 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	1177 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	1178 outType = "sprite";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1179 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1180
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1181 default:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1182 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	1183 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1184 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1185
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1186 if (outBlockW <= 0 \|\| outBlockH <= 0)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1187 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1188 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	1189 outBlockW, outBlockH);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1190 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1191 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1192
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1193 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	1194 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1195 int err = dmGetErrno();
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1196 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	1197 filename, err, dmErrorStr(err));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1198 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1199 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1200
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1201 if ((buf = dmMalloc(bufSize)) == NULL)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1202 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1203 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	1204 bufSize);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1205 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1206 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1207
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1208 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	1209 outBlockW, outBlockH, outBlockW * outBlockH, outType);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1210
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1211 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	1212 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	1213 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1214 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1215 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1216 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1217 if (!dmConvertImage2Char(buf, image,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1218 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	1219 multicolor))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1220 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1221 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1222
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1223 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1224 if (!dmConvertImage2Sprite(buf, image,
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1225 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	1226 multicolor))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1227 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1228 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1229
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1230 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	1231 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1232 int err = dmGetErrno();
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1233 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	1234 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	1235 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1236 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1237 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1238
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1239 fclose(outFile);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1240 dmFree(buf);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1241 return 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1242
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1243 error:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1244 if (outFile != NULL)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1245 fclose(outFile);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1246 dmFree(buf);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1247 return -1;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1248 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1249
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1250
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 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	1252 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1253 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	1254 size_t bufSize;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1255 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	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 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	1258 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1259 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	1260 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	1261 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	1262 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	1263 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	1264 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1265
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1266 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	1267 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	1268 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	1269 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	1270 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	1271 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1272
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1273 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1274 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	1275 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	1276 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1277
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1278 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	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 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	1281 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	1282 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1283
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 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	1286 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	1287
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1288 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	1289 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1290 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	1291 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	1292
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1293 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	1294 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	1295 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1296 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	1297 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1298 int res = dmGetErrno();
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1299 dmError("Error opening output file '%s', %d: %s\n",
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1300 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	1301 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	1302 }
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 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	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 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	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 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	1309 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1310 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	1311 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	1312 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	1313 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1314
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1315 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	1316
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1317 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	1318 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1319 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	1320 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	1321 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1322 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	1323 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	1324 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1326 itemCount++;
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1329 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	1330 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1331 else
423 11b3adb3bdb1 Fix image format output. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1332 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	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 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	1335 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	1336 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	1337
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338 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	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 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	1341 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1342 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	1343 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	1344 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1345
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1346 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	1347 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	1348 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1349 outImage->width, outImage->height,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1350 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	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 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1353 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1354 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	1355 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	1356 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1357 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	1358 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	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 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	1362 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	1363 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	1364 outIHeight++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1365
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1366 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	1367 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1368
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1369 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	1370 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	1371 outImage->ncolors = C64_NCOLORS;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 457 diff changeset	1372 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	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 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	1375 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1376 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	1377
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1378 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	1379 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1380 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	1381 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	1382 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1383 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1384
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 826 diff changeset	1385 if ((err = dmC64ConvertCSDataToImage(outImage, outX * outWidthPX, outY * outHeight,
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1386 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	1387 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1388 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	1389 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1390 }
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 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	1393 {
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1394 int eres;
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1395
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1396 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	1397 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	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 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	1400 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	1401 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1402
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1403 eres = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1404 if (eres != DMERR_OK)
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1405 {
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1406 dmError("Error writing output image, %s.\n",
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1407 dmErrorStr(eres));
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1408 }
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1409
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1410 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	1411 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1412 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1413 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1414 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	1415 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1416 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	1417 outY++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1418 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1419 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1420
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1421 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1422 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1423
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1424 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	1425 {
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1426 int eres = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1427 if (eres != DMERR_OK)
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1428 {
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1429 dmError("Error writing output image, %s.\n",
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1430 dmErrorStr(eres));
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1431 }
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1434 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	1435 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1436 else
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1437 if (optOutFormat == FFMT_BITMAP)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1438 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1439 if (optSequential)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1440 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1441 dmError("Sequential output not supported for spr/char -> bitmap conversion.\n");
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1442 goto error;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1443 }
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1444 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1445
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1446 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	1447 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	1448
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1449 error:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1450 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	1451 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	1452 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1453
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1454
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1455 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	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 FILE *inFile;
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1458 const DMC64ImageFormat *cfmt;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1459 DMC64Image cimage;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1460 Uint8 *dataBuf = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1461 size_t dataSize;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1462 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	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 // 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	1465 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	1466 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	1467
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1468 // Initialize and parse commandline
814 5753d7f24106 Bump version for gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1469 dmInitProg("gfxconv", "Simple graphics converter", "0.80", 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	1470
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1471 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	1472 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	1473 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	1474
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1475 #ifndef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1476 if (optOutFormat == IMGFMT_PNG)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1477 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1478 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	1479 goto error;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1480 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1481 #endif
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1482
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1483 // 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	1484 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	1485 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1486 char *dext = strrchr(optInFilename, '.');
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1487 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	1488 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	1489 {
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	1490 if (!dmGetFormatByExt(dext + 1, &optInFormat, &optInSubFormat))
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	1491 dmGetC64FormatByExt(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	1492 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1493 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1494
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1495 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	1496 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1497 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	1498 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1499 dmError("Standard input cannot be used without specifying input format.\n");
492 5672dc238904 Add a note to default error message about using --help option. Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	1500 dmError("Perhaps you should try using --help\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1501 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	1502 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1503 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	1504 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1505 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1506 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	1507 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1508 int res = dmGetErrno();
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1509 dmError("Error opening input file '%s', %d: %s\n",
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1510 optInFilename, res, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1511 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	1512 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1513
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1514 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	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 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	1518 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1519 // Probe for format
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1520 const DMC64ImageFormat *forced = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1521 int res;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1522
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1523 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	1524 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1525 forced = &dmC64ImageFormats[optForcedFormat];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1526 dmMsg(0,"Forced %s format image, type %d, %s\n",
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1527 forced->name, forced->type, forced->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	1528 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1529
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1530 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	1531 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	1532 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1533 dmMsg(1,"Probed %s format image, type %d, %s\n",
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1534 cfmt->name, cfmt->type, cfmt->fext);
419 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
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1537 if (res == 0)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1538 optInFormat = FFMT_BITMAP;
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
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1541 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	1542 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1543 DMImageFormat *ifmt = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1544 int index;
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1545 dmMsg(4, "Trying to probe image formats.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1546 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	1547 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1548 optInFormat = FFMT_IMAGE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1549 optInSubFormat = index;
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1550 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	1551 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1552 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1553
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1554 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	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 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	1557 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	1558 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1559
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1560 // 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	1561 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	1562 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1563 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	1564 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	1565 optInSkip, optInSkip, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1566 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1567 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1568
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1569 int inFormat = dmGetConvFormat(optInFormat, optInSubFormat),
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1570 outFormat = dmGetConvFormat(optOutFormat, optOutSubFormat);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1571
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1572 if (inFormat != -1 && outFormat != -1)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1573 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1574 char *inFmtName = convFormatList[inFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1575 *inFmtExt = convFormatList[inFormat].fext,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1576 *outFmtName = convFormatList[outFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1577 *outFmtExt = convFormatList[outFormat].fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1578
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1579 if (optInFormat == FFMT_BITMAP)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1580 inFmtExt = cfmt->name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1581
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1582 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	1583 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	1584 }
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 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	1587 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1588 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1589 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	1590 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	1591 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1592
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1593 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	1594 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1595 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1596 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	1597
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1598 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	1599 {
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1600 dmError("Output filename not set, required for bitmap formats.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1601 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1602 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1603
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1604 switch (optOutFormat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1605 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1606 case FFMT_IMAGE:
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1607 res = dmC64ConvertBMP2Image(&outImage, &cimage, cfmt, FALSE);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1608
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1609 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	1610 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1611 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	1612 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1613 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1614
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1615 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	1616 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1617
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1618
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1619 case FFMT_BITMAP:
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1620 res = dmWriteBitmap(optOutFilename, &cimage, optOutSubFormat, TRUE);
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1621 break;
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1622
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1623 case FFMT_CHAR:
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1624 case FFMT_SPRITE:
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1625 res = dmC64ConvertBMP2Image(&outImage, &cimage, cfmt, TRUE);
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1626
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1627 if (res != DMERR_OK \|\| outImage == NULL)
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1628 {
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1629 dmError("Error in bitmap to template image conversion.\n");
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1630 goto error;
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1631 }
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1632
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1633 res = dmWriteSpritesAndChars(optOutFilename, outImage, optOutFormat, optInMulticolor);
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1634 break;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1635
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1636 default:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1637 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	1638 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1639 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1640
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1641 dmImageFree(outImage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1642 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1643 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1644
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1645 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1646 {
441 2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1647 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1648 int res = DMERR_OK;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1649
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1650 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1651 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1652 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	1653 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	1654 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1655
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1656 // 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	1657 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	1658 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	1659 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	1660 else
2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1661 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	1662
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1663 if (res != DMERR_OK \|\| outImage == NULL)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1664 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	1665
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1666 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	1667 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1668 case FFMT_IMAGE:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1669 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	1670 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1671
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1672 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1673 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1674 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	1675 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1676
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1677 default:
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1678 dmError("Unsupported output format for bitmap/image conversion.\n");
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1679 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	1680 }
806 1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1681
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1682 if (res != DMERR_OK)
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1683 {
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1684 dmError("Error writing output (%s), probably unsupported output format for bitmap/image conversion.\n",
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1685 dmErrorStr(res));
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1686 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1687
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1688 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	1689 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1690 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1691 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1692
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1693 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	1694
466 0bfa6a15bb46 Plug (non-dangerous) memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1695 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	1696 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	1697 return 0;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1698
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1699 error:
466 0bfa6a15bb46 Plug (non-dangerous) memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1700 dmFree(dataBuf);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1701 return -3;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1702 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	1703 }

Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 827:c8beac5313c3