dmlib: tools/gfxconv.c annotate

annotate tools/gfxconv.c @ 1865:3e830bcb001a

Improve color map and ANSI output support.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 24 Jun 2018 17:05:07 +0300
parents	897250732bfd
children	734234e7ca95

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
1835 eb965318101a Bump copyright year. Matti Hamalainen <ccr@tnsp.org> parents: 1829 diff changeset	4 * (C) Copyright 2012-2018 Tecnic Software productions (TNSP)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	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 */
1432 a9516570cc26 Improve build, so that we can build the tools and tests with minimal Matti Hamalainen <ccr@tnsp.org> parents: 1426 diff changeset	8 #include "dmtool.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	9 #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	10 #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	11 #include "dmfile.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"
1433 d8a83582f78f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	14 #include "dmmutex.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	15
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	17 #define DM_MAX_COLORS 256
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	18
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	19 #define DM_ASC_NBITS 8
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	20 #define DM_ASC_NCOLORS 4
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	21 static const char dmASCIIPalette[DM_ASC_NCOLORS] = ".:X#";
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	22
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	23
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 enum
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	26 FFMT_AUTO = 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	27
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	28 FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	29 FFMT_ANSI,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	30 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	31
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	32 FFMT_CHAR,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	33 FFMT_SPRITE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	34 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	35
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	36 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	37 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	39
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	40 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	41 {
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_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	43 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	44 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	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
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	47
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	48 typedef struct
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	49 {
1340 1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	50 char *name; // Descriptive name of the format
1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	51 char *fext; // File extension
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	52 int flags; // DM_FMT_* flags, see libgfx.h
1340 1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	53 int format; // Format identifier
1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	54 int subformat; // Subformat identifier
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	55 } DMConvFormat;
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
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	58 static const DMConvFormat baseFormatList[] =
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 {
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	60 { "ASCII text" , "asc" , DM_FMT_WR , FFMT_ASCII , 0 },
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	61 { "ANSI colored text" , "ansi" , DM_FMT_WR , FFMT_ANSI , 0 },
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	62 { "C64 bitmap image" , NULL , DM_FMT_RDWR , FFMT_BITMAP , -1 },
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	63 { "C64 character/font data" , "chr" , DM_FMT_RDWR , FFMT_CHAR , 0 },
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	64 { "C64 sprite data" , "spr" , DM_FMT_RDWR , FFMT_SPRITE , 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	65 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	67 static const int nbaseFormatList = sizeof(baseFormatList) / sizeof(baseFormatList[0]);
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	68
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	69
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	70 static DMConvFormat *convFormatList = NULL;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	71 static int nconvFormatList = 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	72
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	74 typedef struct
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	75 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	76 BOOL triplet, alpha;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	77 DMColor color;
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	78 unsigned int from, to;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	79 } DMMapValue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	80
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 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	84 *optOutFilename = NULL;
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	85
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	86 int optInFormat = FFMT_AUTO,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	87 optOutFormat = FFMT_ASCII,
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	88 optInSubFormat = -1,
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	89 optOutSubFormat = -1,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 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	91 optPlanedWidth = 1,
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	92 optForcedFormat = -1;
fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	93 unsigned int optInSkip = 0;
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	94
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	95 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	96 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	97 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	98
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 BOOL optInMulticolor = FALSE,
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	100 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	101 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	102 optRemapRemove = FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	103 int optNRemapTable = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	104 DMMapValue optRemapTable[DM_MAX_COLORS];
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	105 int optColorMap[C64_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	106
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	107 DMImageConvSpec optSpec =
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	108 {
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	109 .scaleX = 1,
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	110 .scaleY = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	111 .nplanes = 4,
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	112 .bpp = 8,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	113 .planar = FALSE,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	114 .paletted = FALSE,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	115 .format = 0,
e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 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
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 854 diff changeset	118 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	119 {
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	120 { 0, '?', "help", "Show this help", OPT_NONE },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	121 { 15, 'v', "verbose", "Increase verbosity", OPT_NONE },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	122 { 3, 'o', "output", "Output filename", OPT_ARGREQ },
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	123 { 1, 'i', "informat", "Set input format (spr[:mc:sc], chr[:mc\|sc] or any supported image or C64 bitmap format)", OPT_ARGREQ },
1862 4e1de3546890 Improve skip option (-s) description. Matti Hamalainen <ccr@tnsp.org> parents: 1859 diff changeset	124 { 4, 's', "skip", "Skip N bytes in input from start", OPT_ARGREQ },
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	125 { 5, 'f', "format", "Output format (see --formats)", OPT_ARGREQ },
1640 e9a43ee46f71 Add '-F' short option alias for '--formats'. Matti Hamalainen <ccr@tnsp.org> parents: 1638 diff changeset	126 { 17, 'F', "formats", "List supported input/output formats", OPT_NONE },
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	127 { 8, 'q', "sequential", "Output sequential files (image output only)", OPT_NONE },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	128 { 6, 'c', "colormap", "Color mappings (see below for information)", OPT_ARGREQ },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	129 { 7, 'n', "numitems", "How many 'items' to output (default: all)", OPT_ARGREQ },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	130 { 11, 'w', "width", "Item width (number of items per row, min 1)", OPT_ARGREQ },
987 5af2097ab284 Cleanup gfxconv option help a bit. Matti Hamalainen <ccr@tnsp.org> parents: 983 diff changeset	131 { 9, 'S', "scale", "Scale output image by <n> or <x>:<y> integer factor(s). "
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	132 "-S <n> scales both height and width by <n>.", OPT_ARGREQ },
987 5af2097ab284 Cleanup gfxconv option help a bit. Matti Hamalainen <ccr@tnsp.org> parents: 983 diff changeset	133 { 12, 'P', "paletted", "Use indexed/paletted output IF possible.", OPT_NONE },
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	134 { 13, 'N', "nplanes", "# of bitplanes (some output formats)", OPT_ARGREQ },
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	135 { 18, 'B', "bpp", "Bits per pixel (some output formats)", OPT_ARGREQ },
1293 1dce9e5f4a2f Oops, two options were overlapping, fixed. Matti Hamalainen <ccr@tnsp.org> parents: 1291 diff changeset	136 { 14, 'I', "interleave", "Interleaved/planar output (some output formats)", OPT_NONE },
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	137 { 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	138 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 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	141
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	143 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	144 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	145 printf(
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	146 "Available input/output formats (-f <frmt>):\n"
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	147 " frmt \| RW \| Description\n"
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	148 "------+----+-------------------------------------------------------\n"
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	149 );
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	150
1532 74febc66d90d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1526 diff changeset	151 for (int 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	152 {
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	153 const DMConvFormat *fmt = &convFormatList[i];
1638 07f27ec0801e Adjust "gfxconv --formats" output. Matti Hamalainen <ccr@tnsp.org> parents: 1630 diff changeset	154 printf("%-6s\| %c%c \| %s\n",
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	155 fmt->fext ? fmt->fext : "",
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	156 (fmt->flags & DM_FMT_RD) ? 'R' : ' ',
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	157 (fmt->flags & DM_FMT_WR) ? 'W' : ' ',
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	158 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	159 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	161 printf(
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	162 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	163 "(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	164 "\n"
1604 d91d2a67eda5 Typofix. Matti Hamalainen <ccr@tnsp.org> parents: 1591 diff changeset	165 "Available C64 bitmap formats (-f <frmt>):\n"
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	166 " frmt \| RW \| Type \| Description\n"
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	167 "------+----+-----------------+-------------------------------------\n"
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	168 );
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	169
1532 74febc66d90d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1526 diff changeset	170 for (int i = 0; i < ndmC64ImageFormats; i++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	172 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	173 char buf[64];
1759 027fb7313d85 Add a format flag for marking formats that have broken/incomplete support and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	174 printf("%-6s\| %c%c \| %-15s \| %s%s\n",
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	175 fmt->fext,
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	176 (fmt->flags & DM_FMT_RD) ? 'R' : ' ',
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	177 (fmt->flags & DM_FMT_WR) ? 'W' : ' ',
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1759 diff changeset	178 dmC64GetImageTypeString(buf, sizeof(buf), fmt->format->type, FALSE),
1759 027fb7313d85 Add a format flag for marking formats that have broken/incomplete support and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	179 fmt->name,
027fb7313d85 Add a format flag for marking formats that have broken/incomplete support and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1747 diff changeset	180 fmt->flags & DM_FMT_BROKEN ? " [BROKEN]" : "");
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 }
1667 7f74073813c6 Display number of supported C64 image formats in --formats list of 64vw and gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1664 diff changeset	182 printf("%d formats supported.\n", ndmC64ImageFormats);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	183 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	184
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	185
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	186 void argShowHelp()
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	187 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	188 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	189 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	190
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 printf(
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	192 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	193 "Palette / color remapping (-R)\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	194 "------------------------------\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	195 "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	196 "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	197 "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	198 "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	199 "-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	200 "\n"
1330 62ef5cc2b475 Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 1329 diff changeset	201 "Remap file can be specified as \"-R @filename\", and it is a text file with\n"
62ef5cc2b475 Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 1329 diff changeset	202 "one remap definition per line in same format as above. All empty lines and\n"
62ef5cc2b475 Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 1329 diff changeset	203 "lines starting with a semicolor (;) will be ignored as comments. Any extra\n"
62ef5cc2b475 Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 1329 diff changeset	204 "whitespace separating items will be ignored as well.\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	205 "\n"
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	206 "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	207 "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	208 "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	209 "\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	210 "Color map defs\n"
a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	211 "--------------\n"
456 20122cffde2f Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 455 diff changeset	212 "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	213 "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	214 "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	215 "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	216 "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	217 "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	218 "special color that can be used for transparency.\n"
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	219 "\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	220 );
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	224 const char *dmC64GetANSIFromC64Color(const int col)
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	225 {
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	226 switch (col)
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	227 {
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	228 case 0: return "0;30"; // Black
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	229 case 1: return "0;1;37"; // White
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	230 case 2: return "0;31"; // Red
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	231 case 3: return "0;36";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	232 case 4: return "0;35";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	233 case 5: return "0;32";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	234 case 6: return "0;34";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	235 case 7: return "0;1;33";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	236 case 8: return "0;33";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	237 case 9: return "0;31";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	238 case 10: return "0;1;31";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	239 case 11: return "0;1;30";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	240 case 12: return "0;1;30";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	241 case 13: return "0;1;32";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	242 case 14: return "0;1;34";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	243 case 15: return "0;37";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	244
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	245 default: return "0";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	246 }
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	247 }
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	248
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	249
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	250 int dmGetConvFormat(const int format, const int subformat)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	251 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	252 for (int i = 0; i < nconvFormatList; i++)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	253 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	254 const DMConvFormat *fmt = &convFormatList[i];
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	255 if (fmt->format == format &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	256 fmt->subformat == subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	257 return 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 return -1;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	260 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	261
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	262
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	263 BOOL dmGetC64FormatByExt(const char fext, int format, int *subformat)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	264 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	265 if (fext == NULL)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	266 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	267
1569 7e6af32c8032 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1550 diff changeset	268 for (int i = 0; i < ndmC64ImageFormats; i++)
819 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 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	271 if (fmt->fext != NULL &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	272 strcasecmp(fext, fmt->fext) == 0)
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 *format = FFMT_BITMAP;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	275 *subformat = i;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	276 return TRUE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	277 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	278 }
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 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	281 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	282
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
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	285 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	286 {
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	287 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	288 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	289
1569 7e6af32c8032 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1550 diff changeset	290 for (int i = 0; i < nconvFormatList; i++)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	291 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	292 const 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	293 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	294 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	295 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	296 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	297 *subformat = fmt->subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	298 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	299 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	300 }
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	301
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	302 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	303 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	304
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	305
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	306 static BOOL dmParseMapOptionMapItem(const char popt, DMMapValue value, const unsigned int nmax, const char *msg)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	307 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	308 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	309
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	310 if (opt == NULL)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	311 goto error;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	312
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	313 if ((end = split = strchr(opt, ':')) == NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	314 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	315 dmErrorMsg("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	316 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	317 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	318
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	319 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	320 *end = 0;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	321 for (end--; end > opt && end && isspace(end); end--)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	322 *end = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	323
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	324 // 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	325 if (opt == '#' \|\| opt == '%')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	326 {
867 56e12109b936 Portability warning fixes. Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	327 unsigned int colR, colG, colB, colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	328
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	329 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	330 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	331 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	332 value->alpha = TRUE;
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	333 value->color.a = colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	334 }
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	335 else
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", &colR, &colG, &colB) != 3 &&
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", &colR, &colG, &colB) != 3)
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	338 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	339 dmErrorMsg("Invalid %s value '%s', expected a hex triplet, got '%s'.\n", msg, popt, opt + 1);
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	340 goto error;
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	341 }
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	342
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	343 value->color.r = colR;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	344 value->color.g = colG;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	345 value->color.b = colB;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	346 value->triplet = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	347 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	348 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	349 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	350 if (!dmGetIntVal(opt, &value->from))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	351 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	352 dmErrorMsg("Invalid %s value '%s', could not parse source value '%s'.\n", msg, popt, opt);
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	353 goto error;
473 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 value->triplet = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	356 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	357
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	358 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	359 split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	360 while (split && isspace(split)) split++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	361
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	362 // Parse destination value
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	363 if (!dmGetIntVal(split, &value->to))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	364 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	365 dmErrorMsg("Invalid %s value '%s', could not parse destination value '%s'.\n", msg, popt, split);
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	366 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	367 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	368
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	369 if (!value->triplet && value->from > 255)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	370 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	371 dmErrorMsg("Invalid %s map source color index value %d, must be [0..255].\n", msg, value->from);
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	372 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	373 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	374
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	375 if (value->to > nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	376 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	377 dmErrorMsg("Invalid %s map destination color index value %d, must be [0..%d].\n", msg, value->to, nmax);
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	378 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	379 }
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	380
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	381 dmFree(opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	382 return TRUE;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	383
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	384 error:
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	385 dmFree(opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	386 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	387 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	388
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	389
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	390 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	391 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	392 // Trim whitespace
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	393 if (end != NULL)
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 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	396 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	397 *end = 0;
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 while (opt && isspace(opt)) opt++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	400
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	401 // Parse item based on mode
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	402 if (requireIndex)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	403 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	404 DMMapValue value = (DMMapValue ) pvalue;
475 c0dedfef3edf Fix option parsing of mappings. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	405 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	406 return FALSE;
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 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	409 {
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	410 unsigned int value = (unsigned int ) pvalue;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	411 char *split = strchr(opt, ':');
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	412 if (split != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	413 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	414 dmErrorMsg("Unexpected ':' in indexed %s '%s'.\n", msg, opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	415 return FALSE;
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	418 if (!dmGetIntVal(opt, &value[index]))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	419 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	420 dmErrorMsg("Invalid %s value '%s', could not parse.\n", msg, opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	421 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	422 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	423 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	424
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	425 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	426 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	427
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	428
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	429 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	430 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	431 char *start = opt;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	432
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	433 *nvalues = 0;
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	434 while (start && nvalues < nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	435 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	436 char *end = strchr(start, ',');
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	437
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	438 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	439 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	440
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	441 (*nvalues)++;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	442
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	443 if (!end)
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	444 break;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	445
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	446 start = end + 1;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	447 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	448
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	449 return TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	450 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	451
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	452
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	453 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	454 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	455 FILE *fp;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	456 char line[512];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	457 int res = DMERR_OK;
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 if ((fp = fopen(filename, "r")) == NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	460 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	461 res = dmGetErrno();
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	462 dmError(res, "Could not open color remap file '%s' for reading, %d: %s\n",
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	463 res, dmErrorStr(res));
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	464 return res;
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	467 while (fgets(line, sizeof(line), fp))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	468 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	469 char *start = line;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	470 while (start && isspace(start)) start++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	471
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	472 if (start != 0 && start != ';')
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 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	475 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	476 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	477 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	478 (*nvalue)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	479 if (*nvalue >= nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	480 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	481 dmErrorMsg("Too many mapping pairs in '%s', maximum is %d.\n",
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	482 filename, nmax);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	483 goto error;
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 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	486 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	487 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	488
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	489 error:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	490 fclose(fp);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	491 return res;
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
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 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	496 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 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	498 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499 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	500 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 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	502 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	504 case 17:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	505 argShowFormats();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	506 exit(0);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	507 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	508
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	509 case 15:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	510 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	511 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	512
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 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	514 {
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	515 char *flags = strchr(optArg, ':');
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	516 if (flags != NULL)
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	517 *flags++ = 0;
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	518
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	519 if (!dmGetFormatByExt(optArg, &optInFormat, &optInSubFormat) &&
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	520 !dmGetC64FormatByExt(optArg, &optInFormat, &optInSubFormat))
824 705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	521 {
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	522 dmErrorMsg("Invalid input format '%s', see -F / --formats for format list.\n", optArg);
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	523 return FALSE;
824 705e2e4ed45a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 823 diff changeset	524 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	525
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	526 if (flags != NULL)
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	527 {
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	528 switch (optInFormat)
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	529 {
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	530 case FFMT_SPRITE:
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	531 case FFMT_CHAR:
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	532 if (strcasecmp(flags, "mc") == 0)
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	533 optInMulticolor = TRUE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	534 else
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	535 if (strcasecmp(flags, "sc") == 0)
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	536 optInMulticolor = FALSE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	537 else
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	538 {
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	539 dmErrorMsg("Invalid input format flags for sprite/char '%s', should be 'mc' or 'sc'.\n",
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	540 flags);
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	541 return FALSE;
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	542 }
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	543 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	544
1863 b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	545 default:
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	546 dmErrorMsg("Input format '%s' does not support any flags ('%s').\n",
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	547 optArg, flags);
b2287ace1f0d Make input format -i option saner and more uniform with output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1862 diff changeset	548 return FALSE;
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	549 }
f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	550 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	553
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 case 3:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 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	556 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	557
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 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	559 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	560 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	561 dmErrorMsg("Invalid skip value argument '%s'.\n", optArg);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 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	563 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 case 5:
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	567 if (!dmGetFormatByExt(optArg, &optOutFormat, &optOutSubFormat) &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	568 !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	569 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	570 dmErrorMsg("Invalid output format '%s'.\n", optArg);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	571 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	572 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 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 6:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 {
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	577 int index, ncolors;
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	578 if (!dmParseMapOptionString(optArg, optColorMap,
1584 f1b279ba47a8 Remove some useless constants. Matti Hamalainen <ccr@tnsp.org> parents: 1569 diff changeset	579 &ncolors, C64_NCOLORS, FALSE, "color table option"))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	580 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	581
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 dmMsg(1, "Set color table: ");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	583 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	584 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 dmPrint(1, "[%d:%d]%s",
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	586 index, optColorMap[index],
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	587 (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	588 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 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	590 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 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	594 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	595 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	596 dmErrorMsg("Invalid count value argument '%s'.\n", optArg);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 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	598 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 case 8:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 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	603 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 case 9:
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	606 if (sscanf(optArg, "%d:%d", &optSpec.scaleX, &optSpec.scaleY) != 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	607 {
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	608 if (sscanf(optArg, "%d", &optSpec.scaleX) == 1)
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	609 optSpec.scaleY = optSpec.scaleX;
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	610 else
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	612 dmErrorMsg("Invalid scale option value '%s', should be <n> or <w>:<h>.\n", optArg);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 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	614 }
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	615 }
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	616 if (optSpec.scaleX < 1 \|\| optSpec.scaleX > 50)
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	617 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	618 dmErrorMsg("Invalid X scale value '%d'.\n", optSpec.scaleX);
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	619 return FALSE;
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	620 }
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	621 if (optSpec.scaleY < 1 \|\| optSpec.scaleY > 50)
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	622 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	623 dmErrorMsg("Invalid Y scale value '%d'.\n", optSpec.scaleY);
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	624 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	625 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628 case 11:
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	629 if (sscanf(optArg, "%d", &optPlanedWidth) != 1)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	631 dmErrorMsg("Invalid planed width value argument '%s'.\n", optArg);
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	632 return FALSE;
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	633 }
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	634 if (optPlanedWidth < 1 \|\| optPlanedWidth > 512)
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	635 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	636 dmErrorMsg("Invalid planed width value '%d' [1..512].\n", optPlanedWidth);
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	637 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	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 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	640
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 case 12:
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	642 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	643 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	645 case 13:
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	646 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	647 int tmp = atoi(optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	648 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	649 {
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	650 dmErrorMsg("Invalid number of bitplanes value '%s'.\n", optArg);
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	651 return FALSE;
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	652 }
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	653 optSpec.nplanes = tmp;
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	654 }
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	655 break;
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	656
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	657 case 18:
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	658 {
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	659 int tmp = atoi(optArg);
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	660 if (tmp < 1 \|\| tmp > 32)
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	661 {
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	662 dmErrorMsg("Invalid number of bits per pixel value '%s'.\n", optArg);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	663 return FALSE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	664 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	665 optSpec.nplanes = tmp;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	666 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	667 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	668
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	669 case 14:
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	670 optSpec.planar = TRUE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	671 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	672
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	673 case 16:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	674 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	675 char *tmp;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	676 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	677 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	678 optRemapRemove = TRUE;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	679 *tmp = 0;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	680 }
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	681
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	682 if (optArg[0] == '@')
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	683 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	684 if (optArg[1] != 0)
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	685 {
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	686 int res;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	687 if ((res = dmParseColorRemapFile(optArg + 1,
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	688 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	689 return FALSE;
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	690 }
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	691 else
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	692 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	693 dmErrorMsg("No remap filename given.\n");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	694 return FALSE;
823 f0429dbd77ec Oops, missing } from one of the previous commits. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 822 diff changeset	695 }
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 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	698 {
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	699 if (!dmParseMapOptionString(optArg, optRemapTable,
8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	700 &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	701 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	702 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	703 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	704
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	705 optRemapColors = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	706 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	707
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	708 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	709 {
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 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	711 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	712 {
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 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	714 }
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 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	716 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	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 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	719 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	720 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	721 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	722 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	723 }
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 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	725 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	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 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	728 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	729 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	730 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	731 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	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 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	734 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	735 dmErrorMsg("Invalid crop mode / argument '%s'.\n", optArg);
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	736 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	737 }
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	738 }
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	739 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	740
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	742 dmErrorMsg("Unknown option '%s'.\n", currArg);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743 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	744 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 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	747 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748
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 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	751 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 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	753 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	754 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	756 dmErrorMsg("Source filename already specified, extraneous argument '%s'.\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	757 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 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	759 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 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	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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765 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	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 i;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	768
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 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	770 {
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	771 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	772 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 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	774 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	775 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	776 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	777 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	778 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	779 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	780 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	781 case FFMT_ANSI:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	782 fprintf(out, "\x1b[%sm##\x1b[0m",
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	783 dmC64GetANSIFromC64Color(optColorMap[val]));
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	788 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789 {
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	790 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	791 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	792 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	793 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	794 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	795 case FFMT_ASCII:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	796 fputc(val ? '#' : '.', out);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	798 case FFMT_ANSI:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	799 fprintf(out, "\x1b[%sm#\x1b[0m",
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	800 dmC64GetANSIFromC64Color(optColorMap[val]));
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 }
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
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	808 void dmDumpCharASCII(FILE outFile, const Uint8 buf, const size_t offs, const int fmt, const 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	809 {
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	810 for (size_t yc = 0; yc < C64_CHR_HEIGHT_UT; yc++)
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 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	812 fprintf(outFile, "%04" DM_PRIx_SIZE_T " : ", offs + yc);
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	813 dmPrintByte(outFile, buf[yc], fmt, 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	814 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	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 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	819 void dmDumpSpriteASCII(FILE outFile, const Uint8 buf, const size_t offs, const int fmt, 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	820 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	821 size_t bufOffs, xc, yc;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	823 for (bufOffs = yc = 0; yc < C64_SPR_HEIGHT_UT; yc++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	825 fprintf(outFile, "%04" DM_PRIx_SIZE_T " ", offs + bufOffs);
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	826 for (xc = 0; xc < C64_SPR_WIDTH_UT; xc++)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	828 dmPrintByte(outFile, buf[bufOffs], fmt, 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	829 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	830 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	831 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832 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	833 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	837 int dmRemapImageColors(DMImage *pdst, const DMImage src)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	838 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	839 DMColor *npal = dmCalloc(src->ncolors, sizeof(DMColor));
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	840 int mapping = dmMalloc(src->ncolors sizeof(int));
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	841 BOOL mapped = dmMalloc(src->ncolors sizeof(BOOL));
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	842 BOOL used = dmMalloc(src->ncolors sizeof(BOOL));
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	843 int n, index, xc, yc, ncolors;
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	844 DMImage *dst;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	845
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	846 if ((dst = *pdst = dmImageAlloc(src->width, src->height, src->format, src->bpp)) == NULL)
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	847 {
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	848 return dmError(DMERR_MALLOC,
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	849 "Could not allocate memory for remapped image.\n");
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	850 }
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	851
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	852 dmMsg(1, "Remapping %d output image colors of %d colors.\n", optNRemapTable, src->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 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	856 return dmError(DMERR_MALLOC,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	857 "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	858 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	859
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	860 for (index = 0; index < src->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");
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	868 for (ncolors = yc = 0; yc < src->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 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	870 const Uint8 dp = src->data + src->pitch yc;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	871 for (xc = 0; xc < src->width; 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	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];
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	874 if (col < src->ncolors && !used[col])
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	875 {
479 b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	876 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;
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	890 for (n = 0; n < src->ncolors; n++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	891 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	892 if (dmCompareColor(&(src->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 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	904
473 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 // 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	923 if (optRemapRemove)
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	924 dmMsg(2, "Removing unused colors.\n");
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	925
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	926 for (index = 0; index < src->ncolors; index++)
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	927 if (mapping[index] < 0 &&
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	928 (!optRemapRemove \|\| (optRemapRemove && used[index])))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	929 {
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	930 for (n = 0; n < src->ncolors; n++)
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 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 {
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	933 mapping[index] = n;
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	934 mapped[n] = TRUE;
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	935 break;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	936 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	937 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	938
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	939 // 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	940 ncolors = 0;
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	941 for (index = 0; index < src->ncolors; index++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	942 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	943 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	944 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	945 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	946
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	947 // Copy palette entries
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	948 for (index = 0; index < src->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	949 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	950 if (mapping[index] >= 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	951 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	952 memcpy(&npal[mapping[index]], &(src->pal[index]), sizeof(DMColor));
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	953 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	954 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	955
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	956 // 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	957 dmMsg(1, "Remapping image to %d colors...\n", ncolors);
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	958 for (yc = 0; yc < src->height; yc++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	959 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	960 Uint8 sp = src->data + src->pitch yc;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	961 Uint8 dp = dst->data + dst->pitch yc;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	962 for (xc = 0; xc < src->width; xc++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	963 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	964 Uint8 col = sp[xc];
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	965 if (col < src->ncolors && mapping[col] >= 0 && mapping[col] < src->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	966 dp[xc] = mapping[col];
478 7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	967 else
7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	968 dp[xc] = 0;
473 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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	972 // Set new palette, free memory
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	973 dst->pal = npal;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	974 dst->ncolors = 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	975
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	976 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	977 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	978 dmFree(used);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	979 return DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	980 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	981
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	982
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	983 int dmConvertC64Bitmap(DMC64Image *pdst, const DMC64Image src,
ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	984 const DMC64ImageFormat dstFmt, const DMC64ImageFormat srcFmt)
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	985 {
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	986 DMC64Image *dst;
d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	987
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	988 if (pdst == NULL \|\| dstFmt == NULL \|\| src == NULL \|\| srcFmt == NULL)
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	989 return DMERR_NULLPTR;
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	990
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	991 // Allocate the destination image
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	992 if ((dst = *pdst = dmC64ImageAlloc(dstFmt)) == NULL)
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	993 return DMERR_MALLOC;
d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	994
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	995 // Copy rest of the structure ..
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	996 dst->d020 = src->d020;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	997 dst->bgcolor = src->bgcolor;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	998 dst->d022 = src->d022;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	999 dst->d023 = src->d023;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1000 dst->d024 = src->d024;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1001
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1002 // Try to do some simple fixups
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1003 if ((dst->type & D64_FMT_FLI) && (src->type & D64_FMT_FLI) == 0)
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1004 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1005 dmMsg(1, "Upconverting multicolor to FLI.\n");
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1006 for (int i = 0; i < dst->nbanks; i++)
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1007 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1008 dmC64MemBlockCopy(&dst->color[i], &src->color[0]);
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1009 dmC64MemBlockCopy(&dst->screen[i], &src->screen[0]);
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1010 dmC64MemBlockCopy(&dst->bitmap[i], &src->bitmap[0]);
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1011 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1012 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1013 else
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1014 if ((src->type & D64_FMT_FLI) && (dst->type & D64_FMT_FLI) == 0)
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1015 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1016 dmMsg(1, "Downconverting FLI to multicolor.\n");
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1017 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1018
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1019 // Do per opcode copies
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1020 for (int i = 0; i < D64_MAX_ENCDEC_OPS; i++)
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1021 {
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1022 const DMC64EncDecOp *op = fmtGetEncDecOp(dstFmt, i);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1023 DMC64MemBlock srcBlk = NULL, dstBlk = NULL;
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1024 const char *blkname = NULL;
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1025 size_t size;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1026
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1027 if (op->type == DO_LAST)
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1028 break;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1029
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1030 dmC64GetOpSize(op, dstFmt, &size);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1031 switch (op->type)
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1032 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1033 case DO_COPY:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1034 case DO_SET_MEM:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1035 case DO_SET_MEM_HI:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1036 case DO_SET_MEM_LO:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1037 case DO_SET_OP:
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1038 dmC64GetOpMemBlock(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk);
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1039 dmC64GetOpMemBlock(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk);
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1040 blkname = dmC64GetOpSubjectName(op->subject);
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1041
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1042 // Skip if we did previous fixups/upconverts
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1043 if (dstBlk != NULL && dstBlk->data != NULL)
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1044 break;
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1045
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1046 if (srcBlk != NULL && srcBlk->data != NULL && srcBlk->size >= size)
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1047 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1048 // The block exists in source and is of sufficient size, so copy it
1842 a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1049 dmMsg(3, "Copying whole block '%s' op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x)\n",
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1050 blkname, i, op->offs, op->offs, op->bank, size, size);
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1051
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1052 dmC64MemBlockCopy(dstBlk, srcBlk);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1053 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1054 else
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1055 switch (op->subject)
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1056 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1057 case DS_COLOR_RAM:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1058 case DS_SCREEN_RAM:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1059 case DS_BITMAP_RAM:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1060 case DS_CHAR_DATA:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1061 case DS_EXTRA_DATA:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1062 if ((dmC64MemBlockAlloc(dstBlk, size)) != DMERR_OK)
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1063 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1064 return dmError(DMERR_MALLOC,
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1065 "Could not allocate '%s' block! "
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1066 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x)\n",
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1067 blkname, i, op->offs, op->offs, op->bank, size, size);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1068 }
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1069 if (srcBlk == NULL \|\| srcBlk->data == NULL)
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1070 {
1842 a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1071 dmMsg(3, "Creating whole block '%s' op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x)\n",
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1072 blkname, i, op->offs, op->offs, op->bank, size, size);
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1073 }
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1074 else
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1075 {
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1076 dmMsg(3, "Creating block '%s' from partial data op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x)\n",
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1077 blkname, i, op->offs, op->offs, op->bank, size, size);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1078 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1079 switch (op->type)
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1080 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1081 case DO_COPY:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1082 // If some data exists, copy it. Rest is zero.
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1083 // Otherwise just set to zero.
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1084 if (srcBlk != NULL && srcBlk->data != NULL)
1823 02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1085 memcpy(dstBlk->data, srcBlk->data, srcBlk->size);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1086 break;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1087
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1088 case DO_SET_MEM:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1089 // Leave allocate data to zero.
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1090 break;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1091
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1092 case DO_SET_OP:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1093 dmMemset(dstBlk->data, op->offs, size);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1094 break;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1095
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1096 default:
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1097 return dmError(DMERR_INTERNAL,
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1098 "Unhandled op type %d in "
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1099 "op #%d, offs=%d ($%04x), bank=%d, size=%d ($%04x) @ %d ($%04x)\n",
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1100 op->type, i, op->offs, op->offs, op->bank, size, size);
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1101 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1102 break;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1103 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1104 break;
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1105 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1106 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1107
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1108
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1109 return DMERR_OK;
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1110 }
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1111
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1112
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1113 int dmWriteBitmap(const char filename, const DMC64Image image, const DMC64ImageFormat *fmt)
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1114 {
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1115 int res = DMERR_OK;
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1116 DMGrowBuf buf;
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1117
1694 e568535e1a96 Backed out changeset 9611ecd2c4fb Matti Hamalainen <ccr@tnsp.org> parents: 1692 diff changeset	1118 dmGrowBufInit(&buf);
e568535e1a96 Backed out changeset 9611ecd2c4fb Matti Hamalainen <ccr@tnsp.org> parents: 1692 diff changeset	1119
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1120 // Encode to target format
e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1121 dmMsg(1, "Encoding C64 bitmap data to format '%s'\n", fmt->name);
1470 499835ba215c Use dmC64EncodeBMP() in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1465 diff changeset	1122 if ((res = dmC64EncodeBMP(&buf, image, fmt)) != DMERR_OK)
1585 a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1123 {
a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1124 dmErrorMsg("Error encoding bitmap data: %s\n", dmErrorStr(res));
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1125 goto error;
1585 a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1126 }
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1127
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1128 // And output the file
1696 cf0fddd4bf52 When writing a C64 bitmap output, inform the user about the output file size. Matti Hamalainen <ccr@tnsp.org> parents: 1694 diff changeset	1129 dmMsg(1, "Writing output file '%s', %" DM_PRIu_SIZE_T " bytes.\n",
cf0fddd4bf52 When writing a C64 bitmap output, inform the user about the output file size. Matti Hamalainen <ccr@tnsp.org> parents: 1694 diff changeset	1130 filename, buf.len);
cf0fddd4bf52 When writing a C64 bitmap output, inform the user about the output file size. Matti Hamalainen <ccr@tnsp.org> parents: 1694 diff changeset	1131
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1132 res = dmWriteDataFile(NULL, filename, buf.data, buf.len);
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1133
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1134 error:
1465 88845f95e791 Change dmC64EncodeGenericBMP() to use DMGrowBuf, and make the necessary changes in gfxconv as well. Matti Hamalainen <ccr@tnsp.org> parents: 1464 diff changeset	1135 dmGrowBufFree(&buf);
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1136 return res;
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1137 }
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1138
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1139
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1140 #define DMCOL(x) (((x) >> 4) & 0xf)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1141
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1142 int dmWriteIFFMasterRAW(const char filename, const char prefix, const DMImage img, const DMImageConvSpec spec, const int fmtid)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1143 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1144 // Open data file for writing
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1145 FILE *fp = NULL;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1146 int res = DMERR_OK;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1147
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1148 if ((fp = fopen(filename, "w")) == NULL)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1149 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1150 res = dmError(DMERR_FOPEN,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1151 "Could not create file '%s'.\n", filename);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1152 goto err;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1153 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1154
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1155
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1156 fprintf(fp,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1157 "%s_width: dw.w %d\n"
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1158 "%s_height: dw.w %d\n"
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1159 "%s_nplanes: dw.w %d\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1160 prefix, img->width,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1161 prefix, img->height,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1162 prefix, spec->nplanes);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1163
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1164 if (fmtid == DM_IMGFMT_ARAW)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1165 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1166 fprintf(fp,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1167 "%s_ncolors: dw.w %d\n"
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1168 "%s_palette:\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1169 prefix, img->ncolors,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1170 prefix);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1171
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1172 for (int i = 0; i < (1 << spec->nplanes); i++)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1173 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1174 Uint32 color;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1175 if (i < img->ncolors)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1176 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1177 color = (DMCOL(img->pal[i].r) << 8) \|
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1178 (DMCOL(img->pal[i].g) << 4) \|
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1179 (DMCOL(img->pal[i].b));
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1180 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1181 else
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1182 color = 0;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1183
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1184 fprintf(fp,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1185 "\tdc.w $%04X\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1186 color);
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1187 }
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1188
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1189 fprintf(fp,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1190 "%s: incbin \"%s\"\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1191 prefix, filename);
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1192 }
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1193
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1194 err:
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1195 if (fp != NULL)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1196 fclose(fp);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1197
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1198 return res;
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1199 }
be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1200
be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1201
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1202 int dmWriteImage(const char filename, DMImage pimage, DMImageConvSpec spec, const DMImageFormat fmt, 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	1203 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1204 int res = DMERR_OK;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1205
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1206 // Check if writing is even supported
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1207 if (fmt->write == NULL \|\| (fmt->flags & DM_FMT_WR) == 0)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1208 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1209 return dmError(DMERR_NOT_SUPPORTED,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1210 "Writing of '%s' format is not supported.\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1211 fmt->name);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1212 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1213
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1214 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	1215 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1216 dmMsg(1, "Outputting '%s' image %d x %d -> %d x %d [%d x %d]\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1217 fmt->fext,
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1218 pimage->width, pimage->height,
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1219 pimage->width * spec->scaleX, pimage->height * spec->scaleY,
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	1220 spec->scaleX, spec->scaleY);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1221 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1222
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1223 // Perform color remapping
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1224 DMImage *image = pimage;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1225 BOOL allocated = FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1226 if (optRemapColors)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1227 {
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1228 if ((res = dmRemapImageColors(&image, pimage)) != DMERR_OK)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1229 return res;
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1230
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1231 allocated = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1232 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1233
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1234 // Do some format-specific adjustments and other things
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1235 switch (fmt->fmtid)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1236 {
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1237 case DM_IMGFMT_PNG:
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1238 spec->format = spec->paletted ? DM_COLFMT_PALETTE : DM_COLFMT_RGBA;
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1239 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	1240
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1241 case DM_IMGFMT_PPM:
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1242 spec->format = DM_COLFMT_RGB;
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1243 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	1244
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1245 case DM_IMGFMT_RAW:
416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1246 case DM_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	1247 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1248 char prefix = NULL, dataFilename = NULL;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1249 if ((dataFilename = dm_strdup_fext(filename, "%s.inc")) == NULL \|\|
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1250 (prefix = dm_strdup_fext(filename, "img_%s")) == NULL)
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1251 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1252 res = dmError(DMERR_MALLOC,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1253 "Could not allocate memory for filename strings? :O\n");
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1254 goto err;
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1255 }
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1256
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1257 // Replace any non-alphanumerics in palette ID
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1258 for (int i = 0; prefix[i]; i++)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1259 prefix[i] = isalnum(prefix[i]) ? tolower(prefix[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	1260
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1261 if (info)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1262 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1263 dmMsg(2, "%d bitplanes, %s planes output.\n",
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1264 spec->nplanes,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1265 spec->planar ? "planar/interleaved" : "non-interleaved");
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1266 dmMsg(2, "%s datafile '%s', ID prefix '%s'.\n",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1267 fmt->fmtid == DM_IMGFMT_ARAW ? "ARAW" : "RAW",
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1268 dataFilename, prefix);
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1269 }
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1270 res = dmWriteIFFMasterRAW(dataFilename, prefix, image, spec, fmt->fmtid);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1271
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1272 dmFree(prefix);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1273 dmFree(dataFilename);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1274 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1275 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	1276
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1277 default:
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1278 spec->format = spec->paletted ? DM_COLFMT_PALETTE : DM_COLFMT_RGB;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1279 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1280
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1281 // If no error has occured thus far, write the image
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1282 if (res == DMERR_OK)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1283 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1284 if (info)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1285 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1286 char *str;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1287 switch (spec->format)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1288 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1289 case DM_COLFMT_PALETTE : str = "indexed/paletted"; break;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1290 case DM_COLFMT_RGB : str = "24bit RGB"; break;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1291 case DM_COLFMT_RGBA : str = "32bit RGBA"; break;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1292 default : str = "???"; break;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1293 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1294 dmMsg(2, "Using %s output.\n", str);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1295 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1296
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1297 res = fmt->write(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	1298 }
1360 fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1299
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1300 err:
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1301 if (allocated)
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1302 dmImageFree(image);
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1303
fcaf04cb0830 Make image palette remapping use a destination image instead of doing remapping on the source image. Matti Hamalainen <ccr@tnsp.org> parents: 1340 diff changeset	1304 return res;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1306
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307
547 ca5ad51c6479 Make dmConvertByte() static. Matti Hamalainen <ccr@tnsp.org> parents: 546 diff changeset	1308 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	1309 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1310 Uint8 byte = 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1311 int xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1312
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1313 if (multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1314 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1315 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	1316 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1317 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	1318 byte \|= pixel << (6 - (xc * 2));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1319 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1320 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1321 else
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1322 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1323 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	1324 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1325 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	1326 byte \|= pixel << (7 - xc);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1327 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1328 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1329
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1330 return byte;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1331 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1332
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1333
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1334 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	1335 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	1336 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1337 int yc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1338
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1339 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1340 xoffs + C64_CHR_WIDTH_PX > image->width \|\|
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1341 yoffs + C64_CHR_HEIGHT_PX > image->height)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1342 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1343
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1344 for (yc = 0; yc < C64_CHR_HEIGHT_UT; yc++)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1345 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1346 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	1347 buf[yc] = dmConvertByte(sp, multicolor);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1348 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1349
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1350 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1351 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1352
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1353
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1354 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	1355 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	1356 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1357 int yc, xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1358
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1359 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1360 xoffs + C64_SPR_WIDTH_PX > image->width \|\|
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1361 yoffs + C64_SPR_HEIGHT_PX > image->height)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1362 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1363
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1364 for (yc = 0; yc < C64_SPR_HEIGHT_UT; yc++)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1365 {
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1366 for (xc = 0; xc < C64_SPR_WIDTH_PX / C64_SPR_WIDTH_UT; xc++)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1367 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1368 const Uint8 sp = image->data + ((yc + yoffs) image->pitch) + (xc * 8) + xoffs;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1369 buf[(yc * C64_SPR_WIDTH_UT) + xc] = dmConvertByte(sp, multicolor);
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1370 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1371 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1372
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1373 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1374 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1375
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1376
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1377 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	1378 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1379 int ret = DMERR_OK;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1380 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	1381 FILE *outFile = NULL;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1382 Uint8 *buf = NULL;
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1383 size_t outBufSize;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1384 char *outType;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1385
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1386 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1387 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1388 case FFMT_CHAR:
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1389 outBufSize = C64_CHR_SIZE;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1390 outBlockW = image->width / C64_CHR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1391 outBlockH = image->height / C64_CHR_HEIGHT_PX;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1392 outType = "char";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1393 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1394
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1395 case FFMT_SPRITE:
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1396 outBufSize = C64_SPR_SIZE;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1397 outBlockW = image->width / C64_SPR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1398 outBlockH = image->height / C64_SPR_HEIGHT_PX;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1399 outType = "sprite";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1400 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1401
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1402 default:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1403 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1404 "Invalid output format %d, internal error.\n", outFormat);
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1405 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1406 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1407
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1408 if (outBlockW < 1 \|\| outBlockH < 1)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1409 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1410 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1411 "Source image dimensions too small for conversion, block dimensions %d x %d.\n",
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1412 outBlockW, outBlockH);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1413 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1414 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1415
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1416 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	1417 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1418 ret = dmGetErrno();
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1419 dmErrorMsg("Could not open '%s' for writing, %d: %s.\n",
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1420 filename, ret, dmErrorStr(ret));
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1421 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1422 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1423
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1424 if ((buf = dmMalloc(outBufSize)) == NULL)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1425 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1426 dmErrorMsg("Could not allocate %d bytes for conversion buffer.\n",
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1427 outBufSize);
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1428 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1429 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1430
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1431 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	1432 outBlockW, outBlockH, outBlockW * outBlockH, outType);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1433
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1434 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	1435 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	1436 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1437 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1438 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1439 case FFMT_CHAR:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1440 if (!dmConvertImage2Char(buf, image,
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1441 bx * C64_CHR_WIDTH_PX, by * C64_CHR_HEIGHT_PX,
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1442 multicolor))
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1443 {
be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1444 ret = DMERR_DATA_ERROR;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1445 goto error;
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1446 }
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1447 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1448
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1449 case FFMT_SPRITE:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1450 if (!dmConvertImage2Sprite(buf, image,
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1451 bx * C64_SPR_WIDTH_PX, by * C64_SPR_HEIGHT_PX,
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1452 multicolor))
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1453 {
be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1454 ret = DMERR_DATA_ERROR;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1455 goto error;
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1456 }
910 43a71b097f17 10L. Matti Hamalainen <ccr@tnsp.org> parents: 909 diff changeset	1457 break;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1458 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1459
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1460 if (!dm_fwrite_str(outFile, buf, outBufSize))
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1461 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1462 ret = dmGetErrno();
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1463 dmError(ret, "Error writing data block %d,%d to '%s', %d: %s\n",
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1464 bx, by, filename, ret, dmErrorStr(ret));
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1465 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1466 }
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1467 }
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1468
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1469 fclose(outFile);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1470 dmFree(buf);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1471 return 0;
828 c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1472
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1473 error:
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1474 if (outFile != NULL)
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1475 fclose(outFile);
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1476 dmFree(buf);
910 43a71b097f17 10L. Matti Hamalainen <ccr@tnsp.org> parents: 909 diff changeset	1477 return ret;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1478 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1479
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1480
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1481 int dmDumpSpritesAndChars(const Uint8 *dataBuf, const size_t dataSize, const size_t realOffs)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1482 {
1524 532c3ceaec1a Fix uninitilized variable. Matti Hamalainen <ccr@tnsp.org> parents: 1522 diff changeset	1483 int ret = DMERR_OK, itemCount, outWidth, outWidthPX, outHeight;
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1484 size_t offs, outSize;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1485
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1486 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	1487 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1488 case FFMT_CHAR:
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1489 outSize = C64_CHR_SIZE;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1490 outWidth = C64_CHR_WIDTH_UT;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1491 outWidthPX = C64_CHR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1492 outHeight = C64_CHR_HEIGHT_UT;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1493 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1494
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1495 case FFMT_SPRITE:
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1496 outSize = C64_SPR_SIZE;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1497 outWidth = C64_SPR_WIDTH_UT;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1498 outWidthPX = C64_SPR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1499 outHeight = C64_SPR_HEIGHT_UT;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1500 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1501
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1502 default:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1503 return dmError(DMERR_INTERNAL,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1504 "Invalid input format %d, internal error.\n", optInFormat);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1505 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1506
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1507 offs = 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	1508 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	1509
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1510 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	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 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	1513 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	1514
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1515 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	1516 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	1517 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1518 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	1519 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1520 ret = dmGetErrno();
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1521 dmError(ret, "Error opening output file '%s': %s\n",
9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1522 optOutFilename, dmErrorStr(ret));
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 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	1524 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1525
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1526 while (offs + outSize < dataSize && !error && (optItemCount < 0 \|\| itemCount < optItemCount))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1527 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1528 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	1529
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1530 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	1531 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1532 case FFMT_CHAR:
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1533 dmDumpCharASCII(outFile, dataBuf + offs, realOffs + offs, optOutFormat, optInMulticolor);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1534 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1535 case FFMT_SPRITE:
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1536 dmDumpSpriteASCII(outFile, dataBuf + offs, realOffs + offs, optOutFormat, optInMulticolor);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1537 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1538 }
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1539 offs += outSize;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1540 itemCount++;
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1543 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	1544 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1545 else
423 11b3adb3bdb1 Fix image format output. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1546 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	1547 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1548 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	1549 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	1550 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	1551
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1552 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	1553 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1554 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	1555 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1556 dmErrorMsg("Sequential image output requires filename template.\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	1557 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	1558 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1559
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1560 outImage = dmImageAlloc(outWidthPX, outHeight, DM_COLFMT_PALETTE, -1);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1561 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	1562 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1563 outImage->width, outImage->height,
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	1564 outImage->width * optSpec.scaleX, outImage->height * optSpec.scaleY);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1565 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1566 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1567 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1568 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	1569 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	1570 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1571 dmErrorMsg("Single-image output requires count to be set (-n).\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	1572 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	1573 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1574
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1575 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	1576 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	1577 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	1578 outIHeight++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1579
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1580 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_COLFMT_PALETTE, -1);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1581 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1582
1457 dcff9ac95d3f Add function to set DMImage's palette to default C64 palette and use it. Matti Hamalainen <ccr@tnsp.org> parents: 1441 diff changeset	1583 dmSetDefaultC64Palette(outImage);
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1584
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1585 while (offs + outSize < dataSize && (optItemCount < 0 \|\| itemCount < optItemCount))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1586 {
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 826 diff changeset	1587 if ((err = dmC64ConvertCSDataToImage(outImage, outX * outWidthPX, outY * outHeight,
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1588 dataBuf + offs, outWidth, outHeight, optInMulticolor, optColorMap)) != 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	1589 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1590 dmErrorMsg("Internal error in conversion of raw data to bitmap: %d.\n", err);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1591 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1592 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1593
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1594 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	1595 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1596 outFilename = dm_strdup_printf("%s%04d.%s",
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1597 optOutFilename,
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1598 itemCount,
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1599 convFormatList[optOutFormat].fext);
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1600
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1601 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	1602 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1603 dmErrorMsg("Could not allocate memory for filename template?\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	1604 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	1605 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1606
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1607 ret = dmWriteImage(outFilename, outImage, &optSpec,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1608 &dmImageFormatList[optOutSubFormat], TRUE);
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1609 if (ret != DMERR_OK)
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1610 {
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1611 dmErrorMsg("Error writing output image '%s': %s.\n",
9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1612 outFilename, dmErrorStr(ret));
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1613 }
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1614
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1615 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	1616 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1617 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1618 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1619 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	1620 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1621 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	1622 outY++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1623 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1624 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1625
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1626 offs += outSize;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1627 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1628 }
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 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	1631 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1632 ret = dmWriteImage(optOutFilename, outImage, &optSpec,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1633 &dmImageFormatList[optOutSubFormat], TRUE);
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1634 if (ret != DMERR_OK)
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1635 {
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1636 dmError(ret, "Error writing output image '%s': %s.\n",
9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1637 optOutFilename, dmErrorStr(ret));
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1638 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1639 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1640
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1641 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	1642 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1643 else
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1644 if (optOutFormat == FFMT_BITMAP)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1645 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1646 if (optSequential)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1647 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1648 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1649 "Sequential output not supported for spr/char -> bitmap conversion.\n");
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1650 goto error;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1651 }
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1652 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1653
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1654 error:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1655 return ret;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1656 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1657
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1658
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1659 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	1660 {
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	1661 FILE *inFile = NULL;
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1662 const DMC64ImageFormat *inC64Fmt = NULL;
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1663 DMC64Image inC64Image = NULL, outC64Image = NULL;
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1664 Uint8 dataBuf = NULL, dataBufOrig = NULL;
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1665 size_t dataSize, dataSizeOrig;
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1666 int i, 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	1667
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1668 // Default color mapping
1584 f1b279ba47a8 Remove some useless constants. Matti Hamalainen <ccr@tnsp.org> parents: 1569 diff changeset	1669 for (i = 0; i < C64_NCOLORS; i++)
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1670 optColorMap[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	1671
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1672 // Initialize list of additional conversion formats
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1759 diff changeset	1673 dmC64InitializeFormats();
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1674 nconvFormatList = ndmImageFormatList + nbaseFormatList;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1675 convFormatList = dmCalloc(nconvFormatList, sizeof(DMConvFormat));
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1676
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1677 for (n = i = 0; i < ndmImageFormatList; i++)
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1678 {
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1679 const DMImageFormat *sfmt = &dmImageFormatList[i];
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1680 DMConvFormat *dfmt = &convFormatList[n++];
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1681 dfmt->name = sfmt->name;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1682 dfmt->fext = sfmt->fext;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1683 dfmt->flags = sfmt->flags;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1684 dfmt->format = FFMT_IMAGE;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1685 dfmt->subformat = sfmt->fmtid;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1686 }
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1687
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1688 for (i = 0; i < nbaseFormatList; i++)
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1689 memcpy(&convFormatList[n++], &baseFormatList[i], sizeof(DMConvFormat));
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1690
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1691 // Initialize and parse commandline
1836 c4d7ca373ee2 Bump version. Matti Hamalainen <ccr@tnsp.org> parents: 1835 diff changeset	1692 dmInitProg("gfxconv", "Simple graphics converter", "0.93", 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	1693
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1694 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	1695 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	1696 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	1697
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1698 // 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	1699 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	1700 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1701 char *dext = strrchr(optInFilename, '.');
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1702 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	1703 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	1704 {
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	1705 if (!dmGetFormatByExt(dext + 1, &optInFormat, &optInSubFormat))
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	1706 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	1707 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1708 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1709
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1710 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	1711 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1712 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	1713 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1714 dmErrorMsg("Standard input cannot be used without specifying input format.\n");
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1715 dmErrorMsg("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	1716 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	1717 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1718 inFile = stdin;
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1719 optInFilename = "stdin";
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1720 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1721 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1722 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	1723 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1724 int res = dmGetErrno();
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1725 dmErrorMsg("Error opening input file '%s', %d: %s\n",
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1726 optInFilename, res, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1727 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	1728 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1729
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1730 // Read the input ..
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1731 dmMsg(1, "Reading input from '%s'.\n", optInFilename);
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1732
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1733 if (dmReadDataFile(inFile, NULL, &dataBufOrig, &dataSizeOrig) != 0)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1734 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1735
1664 9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	1736 fclose(inFile);
9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	1737
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1738 // Check and compute the input skip
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1739 if (optInSkip > dataSizeOrig)
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1740 {
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1696 diff changeset	1741 dmErrorMsg("Input skip value %d is larger than input size %" DM_PRIu_SIZE_T ".\n",
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1742 optInSkip, dataSizeOrig);
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1743 goto error;
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1744 }
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1745
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1746 dataBuf = dataBufOrig + optInSkip;
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1747 dataSize = dataSizeOrig - optInSkip;
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1748
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1749 // Perform probing, if required
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1750 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	1751 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1752 // Probe for format
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1753 const DMC64ImageFormat *forced = NULL;
1707 a0986cfd6f9d More consistently use DMGrowBuf in the lib64gfx APIs, and implement Matti Hamalainen <ccr@tnsp.org> parents: 1696 diff changeset	1754 DMGrowBuf tbuf;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1755 int res;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1756
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1757 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	1758 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1759 forced = &dmC64ImageFormats[optForcedFormat];
1480 c3eba254bcc2 Change some message priorities. Matti Hamalainen <ccr@tnsp.org> parents: 1479 diff changeset	1760 dmMsg(0, "Forced %s format image, type %d, %s\n",
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1759 diff changeset	1761 forced->name, forced->format->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	1762 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1763
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1764 res = dmC64DecodeBMP(&inC64Image,
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1765 dmGrowBufConstCreateFrom(&tbuf, dataBuf, dataSize),
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1766 0, 2, &inC64Fmt, forced);
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1767
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	1768 if (forced == NULL && inC64Fmt != NULL && 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	1769 {
1522 0d1cf72fb732 Clarify the "probed" messages of gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1514 diff changeset	1770 dmMsg(1, "Probed '%s' format image, type %d, %s\n",
1775 4e4d54135baf Refactor the c64 bitmap format definitions handling to be more flexible. Again. Matti Hamalainen <ccr@tnsp.org> parents: 1759 diff changeset	1771 inC64Fmt->name, inC64Fmt->format->type, inC64Fmt->fext);
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	1772
00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	1773 optInFormat = FFMT_BITMAP;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1774 }
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	1775 else
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	1776 if (res != DMERR_OK && (forced != NULL \|\| optInFormat == FFMT_BITMAP))
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	1777 {
1464 73e00bf7531c Improve one error message by showing the error code. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	1778 dmErrorMsg("Could not decode input image: %s.\n", dmErrorStr(res));
1514 61a5bbaf8d5c Plug some minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1502 diff changeset	1779 goto error;
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	1780 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1781 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1782
463 4204e9ea8ae1 Improve probing. Matti Hamalainen <ccr@tnsp.org> parents: 462 diff changeset	1783 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	1784 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1785 const DMImageFormat *ifmt = NULL;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1786 int index;
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	1787 dmMsg(4, "Trying to probe image formats.\n");
1708 55db8d6dffa5 Do not apply input skip offset here anymore, it's handled more generally elsewhere. Matti Hamalainen <ccr@tnsp.org> parents: 1707 diff changeset	1788 if (dmImageProbeGeneric(dataBuf, dataSize, &ifmt, &index) > 0)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1789 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1790 optInFormat = FFMT_IMAGE;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1791 optInSubFormat = index;
1522 0d1cf72fb732 Clarify the "probed" messages of gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1514 diff changeset	1792 dmMsg(1, "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	1793 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1794 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1795
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1796 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	1797 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1798 dmErrorMsg("No input format specified, and could not be determined automatically.\n");
1514 61a5bbaf8d5c Plug some minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1502 diff changeset	1799 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	1800 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1801
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1802 int inFormat = dmGetConvFormat(optInFormat, optInSubFormat),
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1803 outFormat = dmGetConvFormat(optOutFormat, optOutSubFormat);
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1804
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1805 if (inFormat != -1 && outFormat != -1)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1806 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1807 const char
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1808 *inFmtName = convFormatList[inFormat].name,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1809 *inFmtExt = convFormatList[inFormat].fext,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1810 *outFmtName = convFormatList[outFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1811 *outFmtExt = convFormatList[outFormat].fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1812
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1813 if (optInFormat == FFMT_BITMAP)
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1814 inFmtExt = inC64Fmt->name;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1815
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1816 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	1817 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	1818 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1819
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1820 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	1821 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1822 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1823 case FFMT_CHAR:
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1824 dmDumpSpritesAndChars(dataBuf, dataSize, optInSkip);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1825 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1826
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1827 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	1828 {
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1829 DMImage *outImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1830 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	1831
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1832 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	1833 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1834 dmErrorMsg("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	1835 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1836 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1837
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1838 switch (optOutFormat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1839 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1840 case FFMT_IMAGE:
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1841 res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1842
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1843 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	1844 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1845 dmErrorMsg("Error in bitmap to image conversion.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1846 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1847 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1848
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1849 res = dmWriteImage(optOutFilename, outImage, &optSpec,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1850 &dmImageFormatList[optOutSubFormat], TRUE);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1851 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1852
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1853 case FFMT_BITMAP:
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1854 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1855 &dmC64ImageFormats[optOutSubFormat], inC64Fmt)) != DMERR_OK)
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1856 {
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1857 dmErrorMsg("Error in bitmap format conversion.\n");
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1858 goto error;
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1859 }
1843 bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	1860 if (dmVerbosity >= 2)
bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	1861 {
bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	1862 dmPrint(0, "INPUT:\n"); dmC64ImageDump(stderr, inC64Image, inC64Fmt, " ");
bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	1863 dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutSubFormat], " ");
bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	1864 }
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1865 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutSubFormat]);
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1866 break;
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1867
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1868 case FFMT_CHAR:
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1869 case FFMT_SPRITE:
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1870 res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt);
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1871
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1872 if (res != DMERR_OK \|\| outImage == NULL)
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1873 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1874 dmErrorMsg("Error in bitmap to template image conversion.\n");
810 cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1875 goto error;
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1876 }
cbe263ad963c Some work on charset conversion. Matti Hamalainen <ccr@tnsp.org> parents: 806 diff changeset	1877
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1878 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	1879 break;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1880
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1881 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1882 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1883 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1884 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1885
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1886 dmImageFree(outImage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1887 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1888 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1889
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1890 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1891 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1892 const DMImageFormat *ifmt = &dmImageFormatList[optInSubFormat];
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1893 DMImage *inImage = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1894 int res = DMERR_OK;
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1895 DMResource *fp;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1896
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1897 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1898 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1899 dmErrorMsg("Output filename not set, required for image formats.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1900 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	1901 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1902
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1903 if ((res = dmf_open_memio(NULL, optInFilename, dataBuf, dataSize, &fp)) != DMERR_OK)
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1904 {
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1905 dmErrorMsg("Could not create MemIO handle for input.\n");
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1906 goto error;
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1907 }
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1908
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1909 // 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	1910 if (ifmt->readFILE != NULL)
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1911 res = ifmt->readFILE(fp, &inImage);
441 2a4de5fe4003 Improve loading of input images to use the list provided by libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 435 diff changeset	1912 else
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1913 dmErrorMsg("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	1914
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1915 dmf_close(fp);
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	1916
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1917 if (res != DMERR_OK \|\| inImage == NULL)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1918 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1919
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1920 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	1921 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1922 case FFMT_IMAGE:
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1923 res = dmWriteImage(optOutFilename, inImage, &optSpec,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1924 &dmImageFormatList[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	1925 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1926
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1927 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1928 case FFMT_SPRITE:
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1929 res = dmWriteSpritesAndChars(optOutFilename, inImage, optOutFormat, optInMulticolor);
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1930 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1931
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1932 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1933 dmErrorMsg("Unsupported output format for bitmap/image conversion.\n");
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1934 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	1935 }
806 1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1936
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1937 if (res != DMERR_OK)
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1938 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1939 dmErrorMsg("Error writing output (%s), probably unsupported output format for bitmap/image conversion.\n",
806 1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1940 dmErrorStr(res));
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	1941 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1942
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1943 dmImageFree(inImage);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1944 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1945 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1946 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1947
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	1948 error:
1664 9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	1949 dmFree(convFormatList);
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1950 dmFree(dataBufOrig);
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1951 dmC64ImageFree(inC64Image);
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1952 dmC64ImageFree(outC64Image);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1953
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	1954 return 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	1955 }

Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 1865:3e830bcb001a