dmlib: tools/gfxconv.c annotate

annotate tools/gfxconv.c @ 860:daebbf28953d

The argument handling API in dmargs* was synced with th-libs.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 22 Nov 2014 18:50:07 +0200
parents	ca5b4696be21
children	56e12109b936

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
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	16 #define DM_MAX_COLORS 256
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	17
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	18 #define DM_ASC_NBITS 8
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	19 #define DM_ASC_NCOLORS 4
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	20 static const char dmASCIIPalette[DM_ASC_NCOLORS] = ".:X#";
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	21
473 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
854 ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	39 enum
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	40 {
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	41 CROP_NONE = 0,
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	42 CROP_AUTO,
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	43 CROP_SIZE,
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	44 };
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	45
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	46
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	47 typedef struct
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 char *name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	50 char *fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	51 BOOL in, out;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	52 int format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	53 int subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	54 } DMConvFormat;
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
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	57 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	58 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	59 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	60 "ASCII text", "asc", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	61 FFMT_ASCII , 0,
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 "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	65 FFMT_ANSI , 0,
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 {
454 2f820412d356 Mark PNG as available input format. Matti Hamalainen <ccr@tnsp.org> parents: 446 diff changeset	68 "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	69 FFMT_IMAGE , IMGFMT_PNG,
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 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	72 "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	73 FFMT_IMAGE , IMGFMT_PPM,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	74 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	75 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	76 "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	77 FFMT_IMAGE , IMGFMT_PCX,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	78 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	79 {
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	80 "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	81 FFMT_IMAGE , IMGFMT_ILBM,
f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	82 },
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	83 {
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	84 "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	85 FFMT_IMAGE , IMGFMT_RAW,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	86 },
443 f7c9d1619c74 Beginnings of IFF ILBM reader. Not functional, only chunk parsing, Matti Hamalainen <ccr@tnsp.org> parents: 441 diff changeset	87 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	88 "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	89 FFMT_IMAGE , IMGFMT_ARAW,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	90 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	91
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	92 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	93 "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	94 FFMT_BITMAP , -1,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	95 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	96
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	97 {
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	98 "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	99 FFMT_CHAR , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	100 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	101 {
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	102 "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	103 FFMT_SPRITE , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	104 },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	107 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	108
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	110 typedef struct
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	111 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	112 BOOL triplet, alpha;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	113 DMColor color;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	114 int from, to;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	115 } DMMapValue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	116
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 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	120 *optOutFilename = NULL;
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	121
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	122 int optInFormat = FFMT_AUTO,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	123 optOutFormat = FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	124 optInSubFormat = IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	125 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	126 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	127 optPlanedWidth = 1,
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	128 optForcedFormat = -1,
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	129 optInSkip = 0;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	130
854 ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	131 int optCropMode = CROP_NONE,
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	132 optCropX0, optCropY0,
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	133 optCropW, optCropH;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	134
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 BOOL optInMulticolor = FALSE,
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	136 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	137 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	138 optRemapRemove = FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	139 int optNRemapTable = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	140 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	141 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	142
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	143 DMImageSpec optSpec =
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	144 {
457 9a5ceedf0972 Set default scaling to 1. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	145 .scale = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	146 .nplanes = 4,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	147 .interleave = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	148 .paletted = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	149 .format = 0,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	150 };
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 854 diff changeset	152 static const DMOptArg optList[] =
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 {
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	154 { 0, '?', "help", "Show this help", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	155 { 15, 'v', "verbose", "Increase verbosity", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	156 { 3, 'o', "output", "Output filename", OPT_ARGREQ },
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	157 { 1, 'i', "informat", "Set input format (sprite[:mc:sc], char[:mc\|sc], bitmap[:<bformat>], image)", OPT_ARGREQ },
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	158 { 2, 'm', "multicolor", "Input is multicolor / output in multicolor", OPT_NONE },
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	159 { 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	160 { 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	161 { 17, 0 , "formats", "List available input/output formats", OPT_NONE },
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	162 { 8, 'q', "sequential", "Output sequential files (image output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	163 { 6, 'c', "colormap", "Color mappings (see below for information)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	164 { 7, 'n', "numitems", "How many 'items' to view (default: all)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	165 { 9, 'S', "scale", "Scale output by x (image output only)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	166 { 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	167 { 12, 'P', "paletted", "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	168 { 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	169 { 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	170 { 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	171 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 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	174
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	176 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	177 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 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	179
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	180 printf(
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	181 "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	182 " 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	183 "------+---+---+-----------------------------------------------\n"
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	184 );
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	185
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	186 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	187 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	188 DMConvFormat *fmt = &convFormatList[i];
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	189 printf("%-5s \| %c \| %c \| %s\n",
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	190 fmt->fext ? fmt->fext : "",
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	191 fmt->in ? 'X' : ' ',
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	192 fmt->out ? 'X' : ' ',
b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	193 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	194 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	196 printf(
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	197 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	198 "(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	199 "\n"
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	200 "Available bitmap formats (-f bitmap:<bformat>):\n"
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	201 " Ext \| Type \| Description\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	202 "------+-----------------+-------------------------------------\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	203 );
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	204
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 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	206 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	207 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	208 char buf[64];
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	209 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	210 fmt->fext,
530 5b37a2e427b7 Greatly simplify and also improve the multicolor/hires/lace bitmap->image Matti Hamalainen <ccr@tnsp.org> parents: 516 diff changeset	211 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	212 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	213 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	214 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	215
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	216
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	217 void argShowHelp()
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	218 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	219 dmPrintBanner(stdout, dmProgName, "[options] <input file>");
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 854 diff changeset	220 dmArgsPrintHelp(stdout, optList, optListN, 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	221
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 printf(
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	223 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	224 "Palette / color remapping (-R)\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	225 "------------------------------\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	226 "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	227 "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	228 "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	229 "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	230 "-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	231 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	232 "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	233 "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	234 "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	235 "\n"
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	236 "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	237 "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	238 "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	239 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	240 "Color map defs\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	241 "--------------\n"
456 20122cffde2f Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	242 "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	243 "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	244 "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	245 "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	246 "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	247 "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	248 "special color that can be used for transparency.\n"
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	249 "\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	250 );
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	254 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	255 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	256 int i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	257 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	258 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	259 DMConvFormat *fmt = &convFormatList[i];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	260 if (fmt->format == format &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	261 fmt->subformat == subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	262 return i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	263 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	264 return -1;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	265 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	266
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	267
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	268 BOOL dmGetC64FormatByExt(const char fext, int format, int *subformat)
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 int i;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	271 if (fext == NULL)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	272 return FALSE;
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 for (i = 0; i < ndmC64ImageFormats; i++)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	275 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	276 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	277 if (fmt->fext != NULL &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	278 strcasecmp(fext, fmt->fext) == 0)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	279 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	280 *format = FFMT_BITMAP;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	281 *subformat = i;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	282 return TRUE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	283 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	284 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	285
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	286 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	287 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	288
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	289
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	290
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	291 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	292 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	293 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	294 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	295 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	296
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	297 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	298 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	299 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	300 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	301 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	302 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	303 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	304 *subformat = fmt->subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	305 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	306 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	307 }
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	308
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	309 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	310 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	311
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	312
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	313 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	314 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	315 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	316
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	317 if (opt == NULL)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	318 goto error;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	319
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	320 if ((end = split = strchr(opt, ':')) == NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	321 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	322 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	323 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	324 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	325
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	326 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	327 *end = 0;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	328 for (end--; end > opt && end && isspace(end); end--)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	329 *end = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	330
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	331 // 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	332 if (opt == '#' \|\| opt == '%')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	333 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	334 int colR, colG, colB, colA;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	335
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	336 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	337 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	338 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	339 value->alpha = TRUE;
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	340 value->color.a = colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	341 }
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	342 else
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	343 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	344 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	345 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	346 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	347 goto error;
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	348 }
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	349
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	350 value->color.r = colR;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	351 value->color.g = colG;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	352 value->color.b = colB;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	353 value->triplet = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	354 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	355 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	356 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	357 if (!dmGetIntVal(opt, &value->from))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	358 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	359 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	360 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	361 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	362 value->triplet = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	363 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	364
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	365 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	366 split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	367 while (split && isspace(split)) split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	368
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	369 // Parse destination value
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	370 if (!dmGetIntVal(split, &value->to))
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 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	373 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	374 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	375
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	376 if (!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	377 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	378 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	379 goto error;
473 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 if (value->to < 0 \|\| value->to > nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	383 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	384 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	385 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	386 }
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	387
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	388 dmFree(opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	389 return TRUE;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	390
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	391 error:
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	392 dmFree(opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	393 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	394 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	395
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	396
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	397 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	398 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	399 // Trim whitespace
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	400 if (end != NULL)
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 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	403 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	404 *end = 0;
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 while (opt && isspace(opt)) opt++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	407
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	408 // Parse item based on mode
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	409 if (requireIndex)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	410 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	411 DMMapValue value = (DMMapValue ) pvalue;
475 c0dedfef3edf Fix option parsing of mappings. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	412 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	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 else
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 int value = (int ) pvalue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	418 char *split = strchr(opt, ':');
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	419 if (split != NULL)
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 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	422 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	423 }
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 if (!dmGetIntVal(opt, &value[index]))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	426 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	427 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	428 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	429 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	430 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	431
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	432 return TRUE;
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	436 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	437 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	438 char *start = opt;
473 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 = 0;
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	441 while (start && nvalues < nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	442 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	443 char *end = strchr(start, ',');
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	444
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	445 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	446 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	447
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	448 (*nvalues)++;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	449
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	450 if (!end)
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	451 break;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	452
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	453 start = end + 1;
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	456 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	457 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	458
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 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	461 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	462 FILE *fp;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	463 char line[512];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	464 int res = DMERR_OK;
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 ((fp = fopen(filename, "r")) == NULL)
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 res = dmGetErrno();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	469 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	470 res, dmErrorStr(res));
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	471 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	472 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	473
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	474 while (fgets(line, sizeof(line), fp))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	475 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	476 char *start = line;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	477 while (start && isspace(start)) start++;
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 if (start != 0 && start != ';')
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 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	482 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	483 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	484 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	485 (*nvalue)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	486 if (*nvalue >= nmax)
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 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	489 filename, nmax);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	490 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	491 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	492 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	493 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	494 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	495
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	496 error:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	497 fclose(fp);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	498 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	499 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	500
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	501
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 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	503 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 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	505 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506 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	507 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 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	509 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	511 case 17:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	512 argShowFormats();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	513 exit(0);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	514 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	515
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	516 case 15:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	517 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	518 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	519
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 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	521 {
824 705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	522 switch (tolower(optArg[0]))
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	523 {
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	524 case 's': optInFormat = FFMT_SPRITE; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	525 case 'c': optInFormat = FFMT_CHAR; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	526 case 'b': optInFormat = FFMT_BITMAP; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	527 case 'i': optInFormat = FFMT_IMAGE; break;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	528 default:
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	529 dmError("Invalid input format '%s'.\n", optArg);
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	530 return FALSE;
705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	531 }
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	532
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	533 char *tmp = strchr(optArg, ':');
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	534 if (tmp != NULL)
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	535 {
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	536 tmp++;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	537 switch (optInFormat)
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	538 {
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	539 case FFMT_SPRITE:
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	540 case FFMT_CHAR:
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	541 if (strcasecmp(tmp, "mc") == 0)
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	542 optInMulticolor = TRUE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	543 else
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	544 if (strcasecmp(tmp, "sc") == 0)
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	545 optInMulticolor = FALSE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	546 else
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	547 {
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	548 dmError("Invalid input subformat for sprite/char: '%s', should be 'mc' or 'sc'.\n",
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	549 tmp);
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	550 return FALSE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	551 }
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	552 break;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	553
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	554 case FFMT_BITMAP:
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	555 if (!dmGetC64FormatByExt(tmp, &optInFormat, &optInSubFormat))
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	556 {
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	557 dmError("Invalid bitmap subformat '%s', see format list for valid bformats.\n",
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	558 tmp);
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	559 return FALSE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	560 }
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	561 break;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	562 }
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	563 }
407 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 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 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	568 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	569 break;
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 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	572 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	573 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 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	576 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	577 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 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	579 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	580 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 case 5:
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	584 if (!dmGetFormatByExt(optArg, &optOutFormat, &optOutSubFormat) &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	585 !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	586 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	587 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	588 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	589 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 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	593 {
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	594 int index, ncolors;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	595 if (!dmParseMapOptionString(optArg, optColors,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	596 &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	597 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	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 dmMsg(1, "Set color table: ");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	600 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	601 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 dmPrint(1, "[%d:%d]%s",
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	603 index, optColors[index],
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	604 (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	605 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 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	607 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 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	611 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	612 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 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	614 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	615 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 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	619 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	620 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 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	623 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 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	625 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	626 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 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	628 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	629 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	630 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	631 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634 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	635 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 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	637 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	638 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	639 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	640 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	641 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	642 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	643 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 case 12:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	647 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	648 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	650 case 13:
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	651 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	652 int tmp = atoi(optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	653 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	654 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	655 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	656 return FALSE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	657 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	658 optSpec.nplanes = tmp;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	659 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	660 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	661
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	662 case 14:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	663 optSpec.interleave = TRUE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	664 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	665
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	666
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	667 case 16:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	668 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	669 char *tmp;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	670 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	671 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	672 optRemapRemove = TRUE;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	673 *tmp = 0;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	674 }
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	675
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	676 if (optArg[0] == '@')
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	677 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	678 if (optArg[1] != 0)
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	679 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	680 int res;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	681 if ((res = dmParseColorRemapFile(optArg + 1,
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	682 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	683 return FALSE;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	684 }
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	685 else
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	686 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	687 dmError("No remap filename given.\n");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	688 return FALSE;
823 f0429dbd77ec Oops, missing } from one of the previous commits. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 822 diff changeset	689 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	690 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	691 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	692 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	693 if (!dmParseMapOptionString(optArg, optRemapTable,
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	694 &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	695 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	696 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	697 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	698
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	699 optRemapColors = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	700 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	701
854 ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	702 case 19:
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	703 {
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	704 int tx0, ty0, tx1, ty1;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	705 if (strcasecmp(optArg, "auto") == 0)
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	706 {
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	707 optCropMode = CROP_AUTO;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	708 }
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	709 else
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	710 if (sscanf(optArg, "%d:%d-%d:%d", &tx0, &ty0, &tx1, &ty1) == 4)
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	711 {
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	712 optCropMode = CROP_SIZE;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	713 optCropX0 = tx0;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	714 optCropY0 = ty0;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	715 optCropW = tx1 - tx0 + 1;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	716 optCropH = ty1 - ty0 + 1;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	717 }
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	718 else
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	719 if (sscanf(optArg, "%d:%d:%d:%d", &tx0, &ty0, &tx1, &ty1) == 4)
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	720 {
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	721 optCropMode = CROP_SIZE;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	722 optCropX0 = tx0;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	723 optCropY0 = ty0;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	724 optCropW = tx1;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	725 optCropH = ty1;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	726 }
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	727 else
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	728 {
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	729 dmError("Invalid crop mode / argument '%s'.\n", optArg);
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	730 return FALSE;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	731 }
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	732 }
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	733 break;
ca5b4696be21 Add some code for parsing crop mode option, but the logic itself is not yet Matti Hamalainen <ccr@tnsp.org> parents: 853 diff changeset	734
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736 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	737 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	738 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	739
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740 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	741 }
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 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	745 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 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	747 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	748 else
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 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	751 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 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	753 }
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 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	756 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	757
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 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	760 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 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	762
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 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	764 {
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	765 for (i = DM_ASC_NBITS; i; i -= 2)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767 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	768 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	769 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	770 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	771 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	772 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	773 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	774 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	775 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	776 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	777 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 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	780 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 {
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	787 for (i = DM_ASC_NBITS; 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	788 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789 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	790 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	791 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	792 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	793 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	794 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	795 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	796 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	797 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	798 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	799 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 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	802 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	810 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	811 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 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	813
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	814 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	815 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816 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	817 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	818 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	819 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	820 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	821 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	824 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	825 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826 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	827
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 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	829 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 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	831 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	832 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 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	834 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	835 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 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	839 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	842
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	844 int dmRemapImageColors(DMImage *image)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	845 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	846 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	847 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	848 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	849 BOOL used = dmMalloc(image->ncolors sizeof(BOOL));
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	850 int n, index, xc, yc, ncolors;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	851
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	852 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	853
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	854 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	855 {
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	856 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	857 return DMERR_MALLOC;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	858 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	859
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	860 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	861 {
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 mapping[index] = -1;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	863 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	864 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	865
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	866 // 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	867 dmMsg(2, "Scanning image for used colors...\n");
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	868 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	869 {
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 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	871 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	872 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	873 Uint8 col = dp[xc];
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	874 if (col < image->ncolors && !used[col])
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 used[col] = TRUE;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	877 ncolors++;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	878 }
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	879 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	880 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	881 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	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 // Match and mark mapped colors
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	884 for (index = 0; index < optNRemapTable; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	885 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	886 DMMapValue *map = &optRemapTable[index];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	887 if (map->triplet)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	888 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	889 BOOL found = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	890 for (n = 0; n < image->ncolors; n++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	891 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	892 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	893 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	894 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	895 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	896 n,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	897 map->to);
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	898
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	899 mapping[n] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	900 mapped[map->to] = TRUE;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	901 found = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	902 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	903 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	904
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	905 if (!found)
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 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	908 index,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	909 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	910 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	911 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	912 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	913 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	914 dmMsg(3, "Map index: %d -> %d\n",
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	915 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	916
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	917 mapping[map->from] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	918 mapped[map->to] = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	919 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	920 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	921
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	922
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	923 // 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	924 if (optRemapRemove)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	925 {
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	926 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	927 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	928 if (mapping[index] < 0 && used[index])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	929 {
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	930 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	931 if (!mapped[n])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	932 {
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	933 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	934 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	935 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	936 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	937 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	938 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	939 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	940 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	941 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	942 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	943 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	944 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	945 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	946 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	947 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	948 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	949 break;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	950 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	951 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	952 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	953
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	954 // 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	955 ncolors = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	956 for (index = 0; index < image->ncolors; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	957 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	958 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	959 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	960 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	961
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	962 // Copy palette entries
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	963 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	964 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	965 if (mapping[index] >= 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	966 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	967 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	968 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	969 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	970
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	971 // 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	972 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	973 for (yc = 0; yc < image->height; yc++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	974 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	975 Uint8 dp = image->data + image->pitch yc;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	976 for (xc = 0; xc < image->width; xc++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	977 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	978 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	979 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	980 dp[xc] = mapping[col];
478 7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	981 else
7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	982 dp[xc] = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	983 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	984 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	985
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	986 // Set new palette, free memory
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	987 dmFree(image->pal);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	988 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	989 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	990
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	991 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	992 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	993 dmFree(used);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	994 return DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	995 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	996
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	997
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	998 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	999 {
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1000 FILE *outFile = NULL;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1001 Uint8 *buf = NULL;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1002 size_t bufSize;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1003 int res = DMERR_OK;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1004 const DMC64ImageFormat *fmt = &dmC64ImageFormats[iformat];
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1005
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1006 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	1007 if (image->type != fmt->type && enableFixUps)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1008 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1009 // Try to do some simple fixups
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1010 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	1011 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1012 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	1013 int i;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1014 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	1015 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1016 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	1017 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	1018 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1019 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1020 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1021
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1022
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1023 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	1024 goto error;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1025
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1026 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	1027
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1028 if ((outFile = fopen(filename, "wb")) == NULL)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1029 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1030 res = dmGetErrno();
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1031 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	1032 filename, res, dmErrorStr(res));
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1033 goto error;
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1034 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1035
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1036 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	1037 {
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1038 res = dmGetErrno();
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1039 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	1040 filename, res, dmErrorStr(res));
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1041 }
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1042
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1043 error:
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1044 if (outFile != NULL)
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1045 fclose(outFile);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1046 dmFree(buf);
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1047 return res;
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1048 }
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1049
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1050
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1051 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	1052 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1053 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	1054 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1055 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	1056 dmImageFormatList[iformat].fext,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1057 image->width, image->height,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1058 image->width * spec->scale, image->height * spec->scale,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1059 spec->scale);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1060 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1061
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1062 // Perform color remapping
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1063 if (optRemapColors)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1064 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1065 int res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1066 if ((res = dmRemapImageColors(image)) != DMERR_OK)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1067 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1068 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1069
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1070 switch (iformat)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1071 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1072 #ifdef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1073 case IMGFMT_PNG:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1074 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	1075 spec->format = spec->paletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1076 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	1077 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1078
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1079 case IMGFMT_PPM:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1080 if (info) dmMsg(2, "24bit RGB output.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1081 spec->format = DM_IFMT_RGB;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1082 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	1083
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1084 case IMGFMT_PCX:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1085 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	1086 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	1087
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1088 case IMGFMT_RAW:
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1089 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	1090 {
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1091 FILE *fp;
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1092 char *dataFilename;
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1093
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1094 // Form data file filename
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1095 dataFilename = dm_strdup_fext(filename, "%s.inc");
e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1096 if (dataFilename == NULL)
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1097 return DMERR_MALLOC;
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1098
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1099 // Open data file for writing
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1100 if ((fp = fopen(dataFilename, "w")) == NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1101 dmError("Could not create '%s'.\n", dataFilename);
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1102
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1103 dmFree(dataFilename);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1104
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1105 if (fp != NULL)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1106 {
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1107 // Strip extension
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1108 int i;
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1109 char *palID = dm_strdup_fext(filename, "img_%s");
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1110
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1111 // Replace any non-alphanumerics
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1112 for (i = 0; palID[i]; i++)
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1113 {
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1114 if (isalnum(palID[i]))
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1115 palID[i] = tolower(palID[i]);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1116 else
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1117 palID[i] = '_';
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1118 }
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1119
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1120 if (iformat == IMGFMT_ARAW)
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1121 {
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1122 fprintf(fp,
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1123 "%s_width: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1124 "%s_height: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1125 "%s_nplanes: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1126 "%s_ncolors: dw.w %d\n"
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1127 "%s_palette:\n",
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1128 palID, image->width,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1129 palID, image->height,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1130 palID, spec->nplanes,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1131 palID, image->ncolors,
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1132 palID);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1133
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1134 dmWriteIFFMasterRAWPalette(fp, image, 1 << optSpec.nplanes, NULL, NULL);
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1135
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1136 fprintf(fp,
477 0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1137 "%s: incbin \"%s\"\n",
0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1138 palID, filename);
566 d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1139 }
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1140 else
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1141 {
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1142 fprintf(fp,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1143 "%s_width: dw.w %d\n"
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1144 "%s_height: dw.w %d\n"
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1145 "%s_nplanes: dw.w %d\n",
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1146 palID, image->width,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1147 palID, image->height,
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1148 palID, spec->nplanes);
d400e32b62d9 Add a slightly different raw output format. Matti Hamalainen <ccr@tnsp.org> parents: 557 diff changeset	1149 }
477 0fd0e301b6fc Add incbin line for ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 476 diff changeset	1150
462 ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1151 fclose(fp);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1152 dmFree(palID);
ab401a5087f9 Improve ARAW output. Matti Hamalainen <ccr@tnsp.org> parents: 460 diff changeset	1153 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1154
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1155 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	1156 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	1157 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1158 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	1159
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 default:
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1161 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	1162 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1163 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1164
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1165
547 ca5ad51c6479 Make dmConvertByte() static. Matti Hamalainen <ccr@tnsp.org> parents: 546 diff changeset	1166 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	1167 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1168 Uint8 byte = 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1169 int xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1170
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1171 if (multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1172 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1173 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	1174 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1175 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	1176 byte \|= pixel << (6 - (xc * 2));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1177 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1178 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1179 else
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 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	1182 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1183 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	1184 byte \|= pixel << (7 - xc);
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 }
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 return byte;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1189 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1190
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 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	1193 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	1194 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1195 int yc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1196
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1197 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1198 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	1199 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	1200 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1201
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1202 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	1203 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1204 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	1205 buf[yc] = dmConvertByte(sp, multicolor);
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 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1209 }
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
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1212 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	1213 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	1214 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1215 int yc, xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1216
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1217 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1218 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	1219 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	1220 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1221
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1222 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	1223 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1224 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	1225 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1226 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	1227 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	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
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1231 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1232 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1233
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1234
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1235 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	1236 {
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1237 int outBlockW, outBlockH, bx, by;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1238 FILE *outFile = NULL;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1239 Uint8 *buf = NULL;
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1240 size_t bufSize;
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1241 char *outType;
489 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 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1244 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1245 case FFMT_CHAR:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1246 bufSize = C64_CHR_SIZE;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1247 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	1248 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	1249 outType = "char";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1250 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1251
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1252 case FFMT_SPRITE:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1253 bufSize = C64_SPR_SIZE;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1254 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	1255 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	1256 outType = "sprite";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1257 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1258
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1259 default:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1260 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	1261 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1262 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1263
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1264 if (outBlockW <= 0 \|\| outBlockH <= 0)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1265 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1266 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	1267 outBlockW, outBlockH);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1268 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1269 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1270
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1271 if ((outFile = fopen(filename, "wb")) == NULL)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1272 {
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1273 int err = dmGetErrno();
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1274 dmError("Could not open '%s' for writing, %d: %s.\n",
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1275 filename, err, dmErrorStr(err));
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1276 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1277 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1278
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1279 if ((buf = dmMalloc(bufSize)) == NULL)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1280 {
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1281 dmError("Could not allocate %d bytes for conversion buffer.\n",
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1282 bufSize);
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1283 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1284 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1285
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1286 dmMsg(1, "Writing %d x %d = %d blocks of %s data...\n",
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1287 outBlockW, outBlockH, outBlockW * outBlockH, outType);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1288
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1289 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	1290 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	1291 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1292 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1293 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1294 case FFMT_CHAR:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1295 if (!dmConvertImage2Char(buf, image,
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1296 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	1297 multicolor))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1298 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1299 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1300
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1301 case FFMT_SPRITE:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1302 if (!dmConvertImage2Sprite(buf, image,
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1303 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	1304 multicolor))
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1305 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1306 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1307
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1308 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	1309 {
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1310 int err = dmGetErrno();
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1311 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	1312 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	1313 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1314 }
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1315 }
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1316
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1317 fclose(outFile);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1318 dmFree(buf);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1319 return 0;
828 c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1320
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1321 error:
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1322 if (outFile != NULL)
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1323 fclose(outFile);
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1324 dmFree(buf);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1325 return -1;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1326 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1327
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1328
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1329 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	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 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	1332 size_t bufSize;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1333 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	1334
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1335 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	1336 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1337 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	1338 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	1339 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	1340 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	1341 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	1342 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1343
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1344 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	1345 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	1346 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	1347 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	1348 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	1349 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1350
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 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1352 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	1353 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	1354 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1355
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1356 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	1357 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1358 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	1359 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	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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1362
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1363 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	1364 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	1365
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1366 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	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 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	1369 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	1370
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1371 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	1372 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	1373 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1374 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	1375 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1376 int res = dmGetErrno();
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1377 dmError("Error opening output file '%s', %d: %s\n",
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1378 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	1379 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	1380 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1381
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1382 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	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 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	1385
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1386 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	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("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	1389 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	1390 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	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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1393 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	1394
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1395 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	1396 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1397 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	1398 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	1399 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1400 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	1401 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	1402 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1403 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1404 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1405 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1406
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1407 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	1408 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1409 else
423 11b3adb3bdb1 Fix image format output. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1410 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	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 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	1413 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	1414 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	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 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	1417 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1418 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	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 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	1421 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	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 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	1425 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	1426 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1427 outImage->width, outImage->height,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1428 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	1429 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1430 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1431 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1432 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	1433 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	1434 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1435 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	1436 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	1437 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1438
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1439 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	1440 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	1441 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	1442 outIHeight++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1443
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1444 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	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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1447 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	1448 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	1449 outImage->ncolors = C64_NCOLORS;
460 0af039b6c0ae Improve transparent color handling. Matti Hamalainen <ccr@tnsp.org> parents: 457 diff changeset	1450 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	1451
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1452 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	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 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	1455
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1456 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	1457 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1458 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	1459 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	1460 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1461 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1462
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 826 diff changeset	1463 if ((err = dmC64ConvertCSDataToImage(outImage, outX * outWidthPX, outY * outHeight,
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1464 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	1465 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1466 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	1467 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1468 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1469
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1470 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	1471 {
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1472 int eres;
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1473
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1474 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	1475 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	1476 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1477 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	1478 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	1479 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1480
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1481 eres = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1482 if (eres != DMERR_OK)
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1483 {
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1484 dmError("Error writing output image, %s.\n",
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1485 dmErrorStr(eres));
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1486 }
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1487
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 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	1489 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1490 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1491 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1492 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	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 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	1495 outY++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1496 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1497 }
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 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1500 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1501
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1502 if (!optSequential)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1503 {
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1504 int eres = dmWriteImage(optOutFilename, outImage, &optSpec, optOutSubFormat, TRUE);
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1505 if (eres != DMERR_OK)
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1506 {
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1507 dmError("Error writing output image, %s.\n",
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1508 dmErrorStr(eres));
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1509 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1510 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1511
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1512 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	1513 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1514 else
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1515 if (optOutFormat == FFMT_BITMAP)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1516 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1517 if (optSequential)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1518 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1519 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	1520 goto error;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1521 }
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1522 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1523
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1524 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	1525 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	1526
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1527 error:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1528 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	1529 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	1530 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1531
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1532
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1533 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	1534 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1535 FILE *inFile;
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1536 const DMC64ImageFormat *cfmt;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1537 DMC64Image cimage;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1538 Uint8 *dataBuf = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1539 size_t dataSize;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1540 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	1541
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1542 // 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	1543 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	1544 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	1545
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1546 // Initialize and parse commandline
814 5753d7f24106 Bump version for gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 810 diff changeset	1547 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	1548
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1549 if (!dmArgsProcess(argc, argv, optList, optListN,
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 854 diff changeset	1550 argHandleOpt, argHandleFile, OPTH_BAILOUT))
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 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	1552
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1553 #ifndef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1554 if (optOutFormat == IMGFMT_PNG)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1555 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1556 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	1557 goto error;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1558 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1559 #endif
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1560
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1561 // 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	1562 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	1563 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1564 char *dext = strrchr(optInFilename, '.');
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1565 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	1566 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	1567 {
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	1568 if (!dmGetFormatByExt(dext + 1, &optInFormat, &optInSubFormat))
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	1569 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	1570 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1571 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1572
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1573 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	1574 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1575 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	1576 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1577 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	1578 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	1579 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	1580 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1581 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	1582 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1583 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1584 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	1585 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1586 int res = dmGetErrno();
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1587 dmError("Error opening input file '%s', %d: %s\n",
49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1588 optInFilename, res, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1589 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	1590 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1591
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1592 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	1593 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1594
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1595 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	1596 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1597 // Probe for format
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1598 const DMC64ImageFormat *forced = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1599 int res;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1600
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1601 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	1602 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1603 forced = &dmC64ImageFormats[optForcedFormat];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1604 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	1605 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	1606 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1607
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1608 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	1609 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	1610 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1611 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	1612 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	1613 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1614
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1615 if (res == 0)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1616 optInFormat = FFMT_BITMAP;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1617 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1618
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1619 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	1620 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1621 DMImageFormat *ifmt = NULL;
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1622 int index;
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1623 dmMsg(4, "Trying to probe image formats.\n");
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1624 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	1625 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1626 optInFormat = FFMT_IMAGE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1627 optInSubFormat = index;
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1628 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	1629 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1630 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1631
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1632 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	1633 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1634 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	1635 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	1636 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1637
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1638 // 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	1639 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	1640 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1641 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	1642 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	1643 optInSkip, optInSkip, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1644 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1645 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1646
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1647 int inFormat = dmGetConvFormat(optInFormat, optInSubFormat),
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1648 outFormat = dmGetConvFormat(optOutFormat, optOutSubFormat);
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 (inFormat != -1 && outFormat != -1)
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 char *inFmtName = convFormatList[inFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1653 *inFmtExt = convFormatList[inFormat].fext,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1654 *outFmtName = convFormatList[outFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1655 *outFmtExt = convFormatList[outFormat].fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1656
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1657 if (optInFormat == FFMT_BITMAP)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1658 inFmtExt = cfmt->name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1659
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1660 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	1661 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	1662 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1663
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1664 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	1665 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1666 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1667 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	1668 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	1669 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1670
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1671 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	1672 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1673 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1674 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	1675
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1676 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	1677 {
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1678 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	1679 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1680 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1681
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1682 switch (optOutFormat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1683 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1684 case FFMT_IMAGE:
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1685 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	1686
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1687 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	1688 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1689 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	1690 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1691 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1692
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1693 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	1694 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1695
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1696
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1697 case FFMT_BITMAP:
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1698 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	1699 break;
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1700
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1701 case FFMT_CHAR:
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1702 case FFMT_SPRITE:
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1703 res = dmC64ConvertBMP2Image(&outImage, &cimage, cfmt, TRUE);
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1704
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1705 if (res != DMERR_OK \|\| outImage == NULL)
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1706 {
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1707 dmError("Error in bitmap to template image conversion.\n");
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1708 goto error;
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1709 }
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1710
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1711 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	1712 break;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1713
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1714 default:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1715 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	1716 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1717 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1718
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1719 dmImageFree(outImage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1720 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1721 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1722
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1723 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1724 {
441 2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1725 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1726 int res = DMERR_OK;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1727
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1728 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1729 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1730 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	1731 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	1732 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1733
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1734 // 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	1735 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	1736 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	1737 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	1738 else
2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1739 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	1740
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1741 if (res != DMERR_OK \|\| outImage == NULL)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1742 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	1743
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1744 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	1745 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1746 case FFMT_IMAGE:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1747 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	1748 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1749
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1750 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1751 case FFMT_SPRITE:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1752 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	1753 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1754
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1755 default:
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1756 dmError("Unsupported output format for bitmap/image conversion.\n");
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1757 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	1758 }
806 1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1759
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1760 if (res != DMERR_OK)
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1761 {
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1762 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	1763 dmErrorStr(res));
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1764 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1765
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1766 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	1767 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1768 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1769 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1770
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1771 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	1772
466 0bfa6a15bb46 Plug (non-dangerous) memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1773 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	1774 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	1775 return 0;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1776
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1777 error:
466 0bfa6a15bb46 Plug (non-dangerous) memory leaks. Matti Hamalainen <ccr@tnsp.org> parents: 465 diff changeset	1778 dmFree(dataBuf);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1779 return -3;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1780 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	1781 }

Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 860:daebbf28953d