dmlib: tools/gfxconv.c annotate

annotate tools/gfxconv.c @ 2077:838ed06b3927

Make a note about '-R +remove' in help.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 10 Dec 2018 14:50:17 +0200
parents	41df24d1dfb6
children	9b6027d51f76

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,
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	30 FFMT_BITMAP,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	31 FFMT_CHAR,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	32 FFMT_SPRITE,
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	33
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	34 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	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
2022 eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	40 enum
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	41 {
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	42 FCMP_NONE = 0,
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	43 FCMP_BEST = 9
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	44 };
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	45
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	46
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	47 static const char *formatTypeList[FFMT_LAST] =
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	48 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	49 "AUTO",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	50 "ASCII text",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	51 "ANSI text",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	52 "C64 bitmap image",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	53 "C64 character/font data",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	54 "C64 sprite data",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	55 "Image",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	56 };
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	57
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	58
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	59 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	60 {
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	61 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	62 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	63 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	64 };
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	65
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	66
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	67 enum
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	68 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	69 SCALE_SET,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	70 SCALE_RELATIVE,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	71 SCALE_AUTO,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	72 };
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	73
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	74
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	75 typedef struct
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	76 {
1340 1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	77 char *name; // Descriptive name of the format
1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	78 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	79 int flags; // DM_FMT_* flags, see libgfx.h
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	80 int type; // Format type
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	81 int format; // Subformat identifier
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	82 } DMConvFormat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	83
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	84
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	85 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	86 {
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	87 { "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	88 { "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	89 { "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	90 { "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	91 { "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	92 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	94 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	95
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	96
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	97 static DMConvFormat *convFormatList = NULL;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	98 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	99
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	101 typedef struct
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	102 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	103 BOOL triplet, alpha;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	104 DMColor color;
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	105 unsigned int from, to;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	106 } DMMapValue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	107
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 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	111 *optOutFilename = NULL;
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	112
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	113 int optInType = FFMT_AUTO,
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	114 optOutType = FFMT_AUTO,
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	115 optInFormat = -1,
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	116 optOutFormat = -1,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 optItemCount = -1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 optPlanedWidth = 1,
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	119 optForcedInSubFormat = -1;
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	120 unsigned int optInSkip = 0;
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	121 BOOL optInSkipNeg = FALSE;
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	122
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	123 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	124 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	125 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	126
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 BOOL optInMulticolor = FALSE,
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	128 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	129 optRemapColors = FALSE,
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	130 optRemapRemove = FALSE,
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	131 optUsePalette = FALSE;
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	132 int optNRemapTable = 0,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	133 optScaleMode = SCALE_AUTO;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	134 DMMapValue optRemapTable[DM_MAX_COLORS];
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	135 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	136
1290 e7dc9bb9777e Rename struct DMImageSpec to DMImageConvSpec. Matti Hamalainen <ccr@tnsp.org> parents: 1288 diff changeset	137 DMImageConvSpec optSpec =
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	138 {
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	139 .scaleX = 1,
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	140 .scaleY = 1,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	141 .nplanes = 4,
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	142 .bpp = 8,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	143 .planar = FALSE,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	144 .format = 0,
2022 eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	145 .compression = FCMP_BEST,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	146 };
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 854 diff changeset	148 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	149 {
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	150 { 0, '?', "help", "Show this help", OPT_NONE },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	151 { 15, 'v', "verbose", "Increase verbosity", OPT_NONE },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	152 { 3, 'o', "output", "Output filename", OPT_ARGREQ },
2006 9f7e9a393771 Document the negative input skip in -s option help. Matti Hamalainen <ccr@tnsp.org> parents: 2005 diff changeset	153 { 4, 's', "skip", "Skip N bytes in input from start (negative value will be offset from input end)", OPT_ARGREQ },
1873 91705a2bc3a4 Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1871 diff changeset	154 { 1, 'i', "informat", "Set input format (spr[:mc\|sc], chr[:mc\|sc] or any supported image or C64 bitmap format, see --formats)", OPT_ARGREQ },
91705a2bc3a4 Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1871 diff changeset	155 { 5, 'f', "format", "Set output format (spr[:mc\|sc], chr[:mc\|sc] or any supported image or C64 bitmap format, see --formats)", OPT_ARGREQ },
1640 e9a43ee46f71 Add '-F' short option alias for '--formats'. Matti Hamalainen <ccr@tnsp.org> parents: 1638 diff changeset	156 { 17, 'F', "formats", "List supported input/output formats", OPT_NONE },
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	157 { 8, 'q', "sequential", "Output sequential files (image output only)", OPT_NONE },
2029 5ecd51009072 Rename '-c' colorindex map short option to '-m'. Matti Hamalainen <ccr@tnsp.org> parents: 2022 diff changeset	158 { 6, 'm', "colormap", "Set color index mapping (see below for information)", OPT_ARGREQ },
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	159 { 7, 'n', "numitems", "How many 'items' to output (default: all)", OPT_ARGREQ },
98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	160 { 11, 'w', "width", "Item width (number of items per row, min 1)", OPT_ARGREQ },
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	161 { 9, 'S', "scale", "Scale output image by specified value(s) (see below)", OPT_ARGREQ },
987 5af2097ab284 Cleanup gfxconv option help a bit. Matti Hamalainen <ccr@tnsp.org> parents: 983 diff changeset	162 { 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	163 { 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	164 { 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	165 { 14, 'I', "interleave", "Interleaved/planar output (some output formats)", OPT_NONE },
2059 5b7f5505267c Improve gfxconv --help a bit. Matti Hamalainen <ccr@tnsp.org> parents: 2058 diff changeset	166 { 20, 'C', "compress", "Use compression -C <0-9>, 0 = disable, default is 9", OPT_ARGREQ },
983 98e749d990b0 Improve help. Matti Hamalainen <ccr@tnsp.org> parents: 975 diff changeset	167 { 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	168 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 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	171
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	173 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	174 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	175 printf(
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	176 "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	177 " frmt \| RW \| Description\n"
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	178 "------+----+-------------------------------------------------------\n"
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	179 );
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	180
1532 74febc66d90d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1526 diff changeset	181 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	182 {
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	183 const DMConvFormat *fmt = &convFormatList[i];
1638 07f27ec0801e Adjust "gfxconv --formats" output. Matti Hamalainen <ccr@tnsp.org> parents: 1630 diff changeset	184 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	185 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	186 (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	187 (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	188 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	189 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	191 printf(
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	192 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	193 "(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	194 "\n"
1604 d91d2a67eda5 Typofix. Matti Hamalainen <ccr@tnsp.org> parents: 1591 diff changeset	195 "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	196 " 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	197 "------+----+-----------------+-------------------------------------\n"
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	198 );
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	199
1532 74febc66d90d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1526 diff changeset	200 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	201 {
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	202 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	203 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	204 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	205 fmt->fext,
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	206 (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	207 (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	208 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	209 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	210 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	211 }
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	212 printf("%d formats supported.\n", ndmC64ImageFormats);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	213 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	214
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	215
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	216 void argShowHelp()
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	217 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	218 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	219 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	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 printf(
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	222 "\n"
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	223 "Output image scaling (-S)\n"
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	224 "-------------------------\n"
2062 f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	225 "Scaling option '-S <n>', '-S <x>:<y>', '-S <x>:<y>*<n>' can be used to set\n"
f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	226 "the direct or relative scale integer factor(s). '-S <n>' sets both height\n"
f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	227 "and width scale factor to <n>. '-S <x>:<y><n>' scales width by Xn and\n"
f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	228 "height Y*n. Certain input formats set their default aspect/scale factors.\n"
f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	229 "By prepending -S parameters with asterisk ('*') you can scale relative to\n"
f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	230 "those values. (e.g. '-S *2' for example.) NOTE! Only integer scale factors\n"
f11fad2dc3b5 Improve scale factor option '-S' help. Matti Hamalainen <ccr@tnsp.org> parents: 2059 diff changeset	231 "can be used at the moment.\n"
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	232 "\n"
1914 87245043a7ae Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1911 diff changeset	233 "Palette remapping (-R)\n"
87245043a7ae Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1911 diff changeset	234 "----------------------\n"
87245043a7ae Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1911 diff changeset	235 "Indexed palette color remapping can be performed via the -R option, either\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	236 "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	237 "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	238 "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	239 "-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	240 "\n"
1330 62ef5cc2b475 Clarify help. Matti Hamalainen <ccr@tnsp.org> parents: 1329 diff changeset	241 "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	242 "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	243 "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	244 "whitespace separating items will be ignored as well.\n"
818 a6452b575c63 Add some online documentation. Matti Hamalainen <ccr@tnsp.org> parents: 814 diff changeset	245 "\n"
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	246 "Optional +remove can be specified (-R <...>+remove), which will remove all\n"
2077 838ed06b3927 Make a note about '-R +remove' in help. Matti Hamalainen <ccr@tnsp.org> parents: 2070 diff changeset	247 "unused colors from the palette. This is not always desirable, for example\n"
838ed06b3927 Make a note about '-R +remove' in help. Matti Hamalainen <ccr@tnsp.org> parents: 2070 diff changeset	248 "when converting multiple images to same palette. You can also specify the\n"
838ed06b3927 Make a note about '-R +remove' in help. Matti Hamalainen <ccr@tnsp.org> parents: 2070 diff changeset	249 "+remove option by itself to remove all unused colors: -R +remove\n"
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	250 "\n"
2029 5ecd51009072 Rename '-c' colorindex map short option to '-m'. Matti Hamalainen <ccr@tnsp.org> parents: 2022 diff changeset	251 "Color index mapping (-m)\n"
5ecd51009072 Rename '-c' colorindex map short option to '-m'. Matti Hamalainen <ccr@tnsp.org> parents: 2022 diff changeset	252 "------------------------\n"
1914 87245043a7ae Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1911 diff changeset	253 "Color mapping 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	254 "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	255 "bit-combination. For example, if the input is multi color sprite or char,\n"
2029 5ecd51009072 Rename '-c' colorindex map short option to '-m'. Matti Hamalainen <ccr@tnsp.org> parents: 2022 diff changeset	256 "you can define colors like: -m 0,8,3,15 .. for single color: -m 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	257 "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	258 "00, 01, 10, 11 (multi color) and 0, 1 (single color). NOTICE! 255 is the\n"
1914 87245043a7ae Clarify gfxconv help. Matti Hamalainen <ccr@tnsp.org> parents: 1911 diff changeset	259 "special transparency color index.\n"
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	260 "\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	261 );
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264
1866 734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	265 //
734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	266 // Return a "matching" ANSI colour code for given C64 palette index.
734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	267 // As the standard 16 ANSI colours are not exact match and some C64
734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	268 // colours cant be represented, this is an imperfect conversion.
734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	269 //
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	270 const char *dmC64GetANSIFromC64Color(const int col)
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	271 {
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	272 switch (col)
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	273 {
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	274 case 0: return "0;30"; // Black
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	275 case 1: return "0;1;37"; // White
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	276 case 2: return "0;31"; // Red
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	277 case 3: return "0;36";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	278 case 4: return "0;35";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	279 case 5: return "0;32";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	280 case 6: return "0;34";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	281 case 7: return "0;1;33";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	282 case 8: return "0;33";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	283 case 9: return "0;31";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	284 case 10: return "0;1;31";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	285 case 11: return "0;1;30";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	286 case 12: return "0;1;30";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	287 case 13: return "0;1;32";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	288 case 14: return "0;1;34";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	289 case 15: return "0;37";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	290
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	291 default: return "0";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	292 }
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	293 }
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	294
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	295
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	296 BOOL dmGetConvFormat(const int type, const int format, DMConvFormat *pfmt)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	297 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	298 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	299 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	300 const DMConvFormat *fmt = &convFormatList[i];
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	301 if (fmt->type == type &&
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	302 fmt->format == format)
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	303 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	304 memcpy(pfmt, fmt, sizeof(DMConvFormat));
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	305 return TRUE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	306 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	307 }
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	308
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	309 for (int i = 0; i < nconvFormatList; i++)
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	310 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	311 const DMConvFormat *fmt = &convFormatList[i];
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	312 if (fmt->type == type && type == FFMT_BITMAP)
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	313 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	314 const DMConvFormat *fmt = &convFormatList[i];
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	315 const DMC64ImageFormat *cfmt = &dmC64ImageFormats[format];
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	316 memcpy(pfmt, fmt, sizeof(DMConvFormat));
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	317 pfmt->fext = cfmt->name;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	318 return TRUE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	319 }
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	320 }
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	321
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	322 return FALSE;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	323 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	324
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	325
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	326 BOOL dmGetC64FormatByExt(const char fext, int type, int *format)
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	327 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	328 if (fext == NULL)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	329 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	330
1569 7e6af32c8032 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1550 diff changeset	331 for (int i = 0; i < ndmC64ImageFormats; i++)
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	332 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	333 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	334 if (fmt->fext != NULL &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	335 strcasecmp(fext, fmt->fext) == 0)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	336 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	337 *type = FFMT_BITMAP;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	338 *format = i;
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	339 return TRUE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	340 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	341 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	342
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	343 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	344 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	345
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	346
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	347 BOOL dmGetFormatByExt(const char fext, int type, int *format)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	348 {
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	349 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	350 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	351
1569 7e6af32c8032 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1550 diff changeset	352 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	353 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	354 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	355 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	356 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	357 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	358 *type = fmt->type;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	359 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	360 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	361 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	362 }
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	363
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	364 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	365 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	366
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	367
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	368 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	369 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	370 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	371
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	372 if (opt == NULL)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	373 goto error;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	374
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	375 if ((end = split = strchr(opt, ':')) == NULL)
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 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	378 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	379 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	380
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	381 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	382 *end = 0;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	383 for (end--; end > opt && end && isspace(end); end--)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	384 *end = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	385
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	386 // 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	387 if (opt == '#' \|\| opt == '%')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	388 {
867 56e12109b936 Portability warning fixes. Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	389 unsigned int colR, colG, colB, colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	390
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	391 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	392 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	393 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	394 value->alpha = TRUE;
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	395 value->color.a = colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	396 }
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	397 else
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	398 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	399 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	400 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	401 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	402 goto error;
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	403 }
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	404
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	405 value->color.r = colR;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	406 value->color.g = colG;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	407 value->color.b = colB;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	408 value->triplet = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	409 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	410 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	411 {
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	412 if (!dmGetIntVal(opt, &value->from, NULL))
473 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("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	415 goto error;
473 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 value->triplet = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	418 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	419
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	420 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	421 split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	422 while (split && isspace(split)) split++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	423
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	424 // Parse destination value
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	425 if (!dmGetIntVal(split, &value->to, NULL))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	426 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	427 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	428 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	429 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	430
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	431 if (!value->triplet && value->from > 255)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	432 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	433 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	434 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	435 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	436
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	437 if (value->to > nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	438 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	439 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	440 goto error;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	441 }
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	442
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	443 dmFree(opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	444 return TRUE;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	445
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	446 error:
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	447 dmFree(opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	448 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	449 }
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 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	453 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	454 // Trim whitespace
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	455 if (end != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	456 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	457 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	458 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	459 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	460 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	461 while (opt && isspace(opt)) opt++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	462
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	463 // Parse item based on mode
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	464 if (requireIndex)
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 DMMapValue value = (DMMapValue ) pvalue;
475 c0dedfef3edf Fix option parsing of mappings. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	467 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	468 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	469 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	470 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	471 {
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	472 unsigned int value = (unsigned int ) pvalue;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	473 char *split = strchr(opt, ':');
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	474 if (split != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	475 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	476 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	477 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	478 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	479
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	480 if (!dmGetIntVal(opt, &value[index], NULL))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	481 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	482 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	483 return FALSE;
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 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	486
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	487 return TRUE;
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
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	490
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	491 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	492 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	493 char *start = opt;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	494
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	495 *nvalues = 0;
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	496 while (start && nvalues < nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	497 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	498 char *end = strchr(start, ',');
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	499
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	500 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	501 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	502
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	503 (*nvalues)++;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	504
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	505 if (!end)
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	506 break;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	507
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	508 start = end + 1;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	509 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	510
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	511 return TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	512 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	513
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	514
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	515 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	516 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	517 FILE *fp;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	518 char line[512];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	519 int res = DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	520
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	521 if ((fp = fopen(filename, "r")) == NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	522 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	523 res = dmGetErrno();
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	524 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	525 res, dmErrorStr(res));
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	526 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	527 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	528
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	529 while (fgets(line, sizeof(line), fp))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	530 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	531 char *start = line;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	532 line[sizeof(line) - 1] = 0;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	533
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	534 while (start && isspace(start)) start++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	535
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	536 if (start != 0 && start != ';')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	537 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	538 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	539 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	540 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	541 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	542 (*nvalue)++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	543 if (*nvalue >= nmax)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	544 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	545 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	546 filename, nmax);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	547 goto error;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	548 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	549 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	550 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	551 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	552
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	553 error:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	554 fclose(fp);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	555 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	556 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	557
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	558
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	559 BOOL dmParseFormatOption(const char msg1, const char msg2, char optArg, int format, int *subFormat)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	560 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	561 char *flags = strchr(optArg, ':');
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	562 if (flags != NULL)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	563 *flags++ = 0;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	564
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	565 if (!dmGetFormatByExt(optArg, format, subFormat) &&
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	566 !dmGetC64FormatByExt(optArg, format, subFormat))
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	567 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	568 dmErrorMsg("Invalid %s format '%s', see -F / --formats for format list.\n",
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	569 msg1, optArg);
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	570 return FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	571 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	572
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	573 if (flags != NULL)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	574 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	575 switch (*format)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	576 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	577 case FFMT_SPRITE:
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	578 case FFMT_CHAR:
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	579 if (strcasecmp(flags, "mc") == 0)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	580 optInMulticolor = TRUE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	581 else
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	582 if (strcasecmp(flags, "sc") == 0)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	583 optInMulticolor = FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	584 else
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	585 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	586 dmErrorMsg("Invalid %s format flags for sprite/char '%s', should be 'mc' or 'sc'.\n",
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	587 msg1, flags);
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	588 return FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	589 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	590 break;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	591
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	592 default:
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	593 dmErrorMsg("%s format '%s' does not support any flags ('%s').\n",
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	594 msg2, optArg, flags);
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	595 return FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	596 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	597 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	598
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	599 return TRUE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	600 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	601
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	602
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	603 BOOL dmParseIntValWithSep(char *arg, unsigned int value, char *last, const char sep)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	604 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	605 char ptr = arg, end, start;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	606
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	607 // Skip any whitespace at start
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	608 while (ptr != 0 && isspace(ptr))
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	609 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	610
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	611 start = ptr;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	612
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	613 // Find next not-xdigit/separator
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	614 while (*ptr != 0 &&
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	615 (isxdigit(ptr) \|\| ptr == 'x' \|\| *ptr == '$') &&
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	616 *ptr != sep)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	617 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	618
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	619 end = ptr;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	620
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	621 // Skip whitespace again
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	622 while (ptr != 0 && isspace(ptr))
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	623 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	624
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	625 // Return last character in "last"
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	626 last = ptr;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	627
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	628 // Set end to NUL
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	629 *end = 0;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	630
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	631 // And if last character is not NUL, move ptr
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	632 if (*last != 0)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	633 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	634
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	635 *arg = ptr;
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	636
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	637 return dmGetIntVal(start, value, NULL);
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	638 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	639
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	640
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 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	642 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	643 unsigned int tmpUInt;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	644 char *tmpStr;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	645
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646 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	647 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648 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	649 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650 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	651 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	652
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	653 case 17:
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	654 argShowFormats();
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	655 exit(0);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	656 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	657
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	658 case 15:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	659 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	660 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	661
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 case 1:
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	663 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	664 DMConvFormat fmt;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	665
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	666 if (!dmParseFormatOption("input", "Input", optArg, &optInType, &optForcedInSubFormat))
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	667 return FALSE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	668
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	669 dmGetConvFormat(optInType, optForcedInSubFormat, &fmt);
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	670 if ((fmt.flags & DM_FMT_RD) == 0)
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	671 {
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	672 dmErrorMsg("Invalid input format '%s', does not support reading.\n",
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	673 fmt.name);
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	674 return FALSE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	675 }
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	676 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	678
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679 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	680 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	681 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	682
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 case 4:
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	684 if (!dmGetIntVal(optArg, &optInSkip, &optInSkipNeg))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	686 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	687 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	688 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 case 5:
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	692 {
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	693 DMConvFormat fmt;
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	694
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	695 if (!dmParseFormatOption("output", "Output", optArg, &optOutType, &optOutFormat))
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	696 return FALSE;
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	697
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	698 dmGetConvFormat(optOutType, optOutFormat, &fmt);
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	699 if ((fmt.flags & DM_FMT_WR) == 0)
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	700 {
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	701 dmErrorMsg("Invalid output format '%s', does not support writing.\n",
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	702 fmt.name);
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	703 return FALSE;
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	704 }
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	705 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	708 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	709 {
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	710 int index, ncolors;
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	711 if (!dmParseMapOptionString(optArg, optColorMap,
2030 2b961e6b35e5 Update documentation etc. Matti Hamalainen <ccr@tnsp.org> parents: 2029 diff changeset	712 &ncolors, C64_NCOLORS, FALSE, "color index option"))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	713 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	714
2030 2b961e6b35e5 Update documentation etc. Matti Hamalainen <ccr@tnsp.org> parents: 2029 diff changeset	715 dmMsg(1, "Set color index mapping: ");
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	716 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	717 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	718 dmPrint(1, "[%d:%d]%s",
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	719 index, optColorMap[index],
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	720 (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	721 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 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	723 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 case 7:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	727 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	728 tmpUInt < 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	729 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	730 dmErrorMsg("Invalid count value argument '%s' [1 .. MAXINT]\n",
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	731 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	732 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	733 }
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	734 optItemCount = tmpUInt;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	737 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	738 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	739 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 case 9:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	743 BOOL error = FALSE;
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	744 unsigned int tmpUInt2;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	745 char *tmpStr = dm_strdup(optArg),
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	746 *tmpOpt = tmpStr, sep;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	747
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	748 // Check for "relative scale mode specifier
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	749 if (tmpOpt == '')
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	750 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	751 tmpOpt++;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	752 optScaleMode = SCALE_RELATIVE;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	753 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	754 else
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	755 optScaleMode = SCALE_SET;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	756
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	757 // Parse the values
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	758 if (dmParseIntValWithSep(&tmpOpt, &tmpUInt, &sep, ':'))
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	759 {
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	760 if (sep == ':' &&
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	761 dmParseIntValWithSep(&tmpOpt, &tmpUInt2, &sep, '*'))
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	762 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	763 optSpec.scaleX = tmpUInt;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	764 optSpec.scaleY = tmpUInt2;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	765
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	766 if (sep == '*' &&
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	767 dmParseIntValWithSep(&tmpOpt, &tmpUInt, &sep, 0))
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	768 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	769 optSpec.scaleX *= tmpUInt;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	770 optSpec.scaleY *= tmpUInt;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	771 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	772 error = (sep != 0);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	773 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	774 else
1890 ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	775 if (sep == 0)
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	776 {
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	777 optSpec.scaleX = optSpec.scaleY = tmpUInt;
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	778 }
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	779 else
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	780 error = TRUE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	781 }
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	782 else
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	783 error = TRUE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	784
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	785 dmFree(tmpStr);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	786
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	787 if (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	788 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	789 dmErrorMsg(
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	790 "Invalid scale option value '%s', should be <n>, <w>:<h> or <w>:<h>*<n>.\n",
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	791 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	792 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	793 }
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	794
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	795 if (optSpec.scaleX < 1 \|\| optSpec.scaleX > 50)
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	796 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	797 dmErrorMsg("Invalid X scale value %d.\n", optSpec.scaleX);
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	798 return FALSE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	799 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	800 if (optSpec.scaleY < 1 \|\| optSpec.scaleY > 50)
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	801 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	802 dmErrorMsg("Invalid Y scale value %d.\n", optSpec.scaleY);
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	803 return FALSE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	804 }
407 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 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 case 11:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	809 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	810 tmpUInt < 1 \|\| tmpUInt > 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	811 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	812 dmErrorMsg("Invalid planed width value '%s' [1 .. 512]\n",
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	813 optArg);
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	814 return FALSE;
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	815 }
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	816 optPlanedWidth = tmpUInt;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819 case 12:
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	820 optUsePalette = 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	821 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	823 case 13:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	824 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	825 tmpUInt < 1 \|\| tmpUInt > 8)
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	826 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	827 dmErrorMsg("Invalid number of bitplanes value '%s' [1 .. 8]\n",
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	828 optArg);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	829 return FALSE;
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	830 }
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	831 optSpec.nplanes = tmpUInt;
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	832 break;
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	833
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	834 case 18:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	835 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	836 tmpUInt < 1 \|\| tmpUInt > 32)
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	837 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	838 dmErrorMsg("Invalid number of bits per pixel value '%s' [1 .. 32]\n",
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	839 optArg);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	840 return FALSE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	841 }
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	842 optSpec.nplanes = tmpUInt;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	843 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	844
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	845 case 14:
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	846 optSpec.planar = TRUE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	847 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	848
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	849 case 16:
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	850 if ((tmpStr = dm_strrcasecmp(optArg, "+remove")) != NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	851 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	852 optRemapRemove = TRUE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	853 *tmpStr = 0;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	854 }
821 8ec16cca0eef Change -R remap option syntax slightly and document it. Matti Hamalainen <ccr@tnsp.org> parents: 820 diff changeset	855
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	856 if (optArg[0] == '@')
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	857 {
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	858 if (optArg[1] != 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	859 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	860 int res;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	861 if ((res = dmParseColorRemapFile(optArg + 1,
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	862 optRemapTable, &optNRemapTable, DM_MAX_COLORS)) != DMERR_OK)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	863 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	864 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	865 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	866 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	867 dmErrorMsg("No remap filename given.\n");
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	868 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	869 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	870 }
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	871 else
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	872 {
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	873 if (!dmParseMapOptionString(optArg, optRemapTable,
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	874 &optNRemapTable, DM_MAX_COLORS, TRUE, "color remap option"))
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	875 return FALSE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	876 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	877
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	878 optRemapColors = TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	879 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	880
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	881 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	882 {
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	883 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	884 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	885 {
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	886 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	887 }
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	888 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	889 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	890 {
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	891 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	892 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	893 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	894 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	895 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	896 }
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	897 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	898 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	899 {
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	900 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	901 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	902 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	903 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	904 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	905 }
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	906 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	907 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	908 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	909 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	910 }
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	911 }
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	912 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	913
2022 eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	914 case 20:
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	915 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	916 tmpUInt > FCMP_BEST)
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	917 {
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	918 dmErrorMsg("Invalid compression setting '%s' [%d .. %d]\n",
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	919 optArg, FCMP_NONE, FCMP_BEST);
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	920 return FALSE;
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	921 }
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	922 optSpec.compression = tmpUInt;
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	923 break;
eb6dafdd36dc Add option -C for controlling output file compression (PNG and IFF for now) in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2021 diff changeset	924
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	925 default:
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	926 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	927 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	928 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 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	931 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	933
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 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	935 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936 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	937 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	938 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	940 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	941 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942 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	943 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	944
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	945 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	946 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	947
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	949 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	950 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	951 int i;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	952
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953 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	954 {
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	955 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	956 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	957 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	958 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	959 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	960 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	961 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	962 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	963 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	964 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	965 case FFMT_ANSI:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	966 fprintf(out, "\x1b[%sm##\x1b[0m",
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	967 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	968 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	970 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	973 {
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	974 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	975 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	976 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	977 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	978 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	979 case FFMT_ASCII:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	980 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	981 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	982 case FFMT_ANSI:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	983 fprintf(out, "\x1b[%sm#\x1b[0m",
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	984 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	985 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	989 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	991
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	992 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	993 {
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	994 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	995 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	996 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	997 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	998 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	999 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1000 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1001
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1002
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1003 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	1004 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1005 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	1006
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1007 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	1008 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1009 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	1010 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	1011 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1012 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	1013 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	1014 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1016 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	1017 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020
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	1021 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	1022 {
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	1023 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	1024 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	1025 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	1026 BOOL used = dmMalloc(src->ncolors sizeof(BOOL));
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1027 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	1028 DMImage *dst;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1029
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	1030 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	1031 {
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	1032 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	1033 "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	1034 }
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	1035
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	1036 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	1037
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	1038 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	1039 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1040 return dmError(DMERR_MALLOC,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1041 "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	1042 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1043
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	1044 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	1045 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	1046 mapping[index] = -1;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1047 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	1048 }
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1049
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	1050 // 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	1051 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	1052 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	1053 {
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	1054 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	1055 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	1056 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	1057 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	1058 if (col < src->ncolors && !used[col])
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1059 {
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	1060 used[col] = TRUE;
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1061 ncolors++;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1062 }
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	1063 }
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	1064 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1065 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	1066
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	1067 // Match and mark mapped colors
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1068 for (index = 0; index < optNRemapTable; index++)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1069 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1070 DMMapValue *map = &optRemapTable[index];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1071 if (map->triplet)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1072 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1073 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	1074 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	1075 {
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	1076 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	1077 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1078 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	1079 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	1080 n,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1081 map->to);
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1082
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1083 mapping[n] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1084 mapped[map->to] = TRUE;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1085 found = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1086 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1087 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1088
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1089 if (!found)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1090 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1091 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	1092 index,
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1093 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	1094 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1095 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1096 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1097 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1098 dmMsg(3, "Map index: %d -> %d\n",
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1099 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	1100
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1101 mapping[map->from] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1102 mapped[map->to] = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1103 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1104 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1105
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1106 // 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	1107 if (optRemapRemove)
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1108 dmMsg(2, "Removing unused colors.\n");
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1109
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1110 for (index = 0; index < src->ncolors; index++)
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1111 if (mapping[index] < 0 &&
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1112 (!optRemapRemove \|\| (optRemapRemove && used[index])))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1113 {
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1114 for (n = 0; n < src->ncolors; n++)
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1115 if (!mapped[n])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1116 {
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1117 mapping[index] = n;
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1118 mapped[n] = TRUE;
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1119 break;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1120 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1121 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1122
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	1123 // 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	1124 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	1125 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	1126 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1127 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	1128 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	1129 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1130
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	1131 // 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	1132 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	1133 {
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	1134 if (mapping[index] >= 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1135 {
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	1136 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	1137 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1138 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1139
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1140 // 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	1141 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	1142 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	1143 {
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	1144 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	1145 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	1146 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	1147 {
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	1148 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	1149 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	1150 dp[xc] = mapping[col];
478 7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	1151 else
7c7a57590236 Calculate number of remapped colors. Matti Hamalainen <ccr@tnsp.org> parents: 477 diff changeset	1152 dp[xc] = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1153 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1154 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1155
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1156 // 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	1157 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	1158 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	1159
b768bfb0b364 Improve color remapping, add option for removing unused colors from the final output palette. Matti Hamalainen <ccr@tnsp.org> parents: 478 diff changeset	1160 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	1161 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	1162 dmFree(used);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1163 return DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1164 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1165
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1166
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1167 int dmConvertC64Bitmap(DMC64Image *pdst, const DMC64Image src,
ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1168 const DMC64ImageFormat dstFmt, const DMC64ImageFormat srcFmt)
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1169 {
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1170 DMC64Image *dst;
1891 91b80990043c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1890 diff changeset	1171 DMC64MemBlock srcBlk = NULL, dstBlk = NULL;
91b80990043c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1890 diff changeset	1172 const char *blkname = NULL;
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1173
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1174 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	1175 return DMERR_NULLPTR;
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1176
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	1177 // Allocate the destination image
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1178 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	1179 return DMERR_MALLOC;
d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1180
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	1181 // 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	1182 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	1183 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	1184 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	1185 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	1186 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	1187
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1188 // Try to do some simple fixups
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1933 diff changeset	1189 if ((dst->fmt->type & D64_FMT_FLI) && (src->fmt->type & D64_FMT_FLI) == 0)
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1190 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1191 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	1192 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	1193 {
1929 b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1194 if (dst->color[i].data == NULL)
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1195 dmC64MemBlockCopy(&dst->color[i], &src->color[0]);
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1196
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1197 if (dst->screen[i].data == NULL)
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1198 dmC64MemBlockCopy(&dst->screen[i], &src->screen[0]);
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1199
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1200 if (dst->bitmap[i].data == NULL)
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1201 dmC64MemBlockCopy(&dst->bitmap[i], &src->bitmap[0]);
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1202 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1203 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1204 else
1947 8896d5676f1b Architectural change: remove some duplicated variables from DMC64Image Matti Hamalainen <ccr@tnsp.org> parents: 1933 diff changeset	1205 if ((src->fmt->type & D64_FMT_FLI) && (dst->fmt->type & D64_FMT_FLI) == 0)
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1206 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1207 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	1208 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1209
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	1210 // 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	1211 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	1212 {
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	1213 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	1214 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	1215
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1216 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	1217 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	1218
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	1219 size = dmC64GetOpSubjectSize(op, dstFmt->format);
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	1220 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	1221 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1222 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	1223 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	1224 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	1225 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	1226 case DO_SET_OP:
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1227 dmC64GetOpMemBlock(src, op->subject, op->bank, (const DMC64MemBlock **) &srcBlk);
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1228 dmC64GetOpMemBlock(dst, op->subject, op->bank, (const DMC64MemBlock **) &dstBlk);
219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1229 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	1230
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1231 // 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	1232 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	1233 break;
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1234
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	1235 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	1236 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1237 // 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	1238 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	1239 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	1240
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	1241 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	1242 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1243 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	1244 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	1245 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1246 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	1247 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	1248 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	1249 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	1250 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	1251 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	1252 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1253 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	1254 "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	1255 "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	1256 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	1257 }
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1258 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	1259 {
1842 a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1260 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	1261 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	1262 }
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1263 else
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1264 {
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1265 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	1266 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	1267 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1268 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	1269 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1270 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	1271 // 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	1272 // 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	1273 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	1274 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	1275 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	1276
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1277 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	1278 // 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	1279 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	1280
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1281 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	1282 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	1283 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	1284
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1285 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	1286 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	1287 "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	1288 "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	1289 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	1290 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1291 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	1292 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1293 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	1294 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1295 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1296
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1297 return DMERR_OK;
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1298 }
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1299
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1300
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1301 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	1302 {
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1303 int res = DMERR_OK;
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1304 DMGrowBuf buf;
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1305
1694 e568535e1a96 Backed out changeset 9611ecd2c4fb Matti Hamalainen <ccr@tnsp.org> parents: 1692 diff changeset	1306 dmGrowBufInit(&buf);
e568535e1a96 Backed out changeset 9611ecd2c4fb Matti Hamalainen <ccr@tnsp.org> parents: 1692 diff changeset	1307
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1308 // Encode to target format
e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1309 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	1310 if ((res = dmC64EncodeBMP(&buf, image, fmt)) != DMERR_OK)
1585 a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1311 {
a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1312 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	1313 goto error;
1585 a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1314 }
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1315
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1316 // 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	1317 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	1318 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	1319
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1320 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	1321
12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1322 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	1323 dmGrowBufFree(&buf);
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1324 return res;
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1325 }
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1326
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1327
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1328 int dmWriteIFFMasterRAWHeaderFile(
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1329 const char hdrFilename, const char dataFilename,
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1330 const char prefix, const DMImage img,
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1331 const DMImageConvSpec *spec)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1332 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1333 DMResource *fp;
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1334 int res;
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1335
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1336 if ((res = dmf_open_stdio(hdrFilename, "wb", &fp)) != DMERR_OK)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1337 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1338 return dmError(res,
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1339 "RAW: Could not open file '%s' for writing.\n",
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1340 hdrFilename);
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1341 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1342
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1343 res = dmWriteIFFMasterRAWHeader(fp, dataFilename, prefix, img, spec);
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1344
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1345 dmf_close(fp);
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1346 return res;
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1347 }
be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1348
be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1349
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1350 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	1351 {
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	1352 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	1353
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1354 // 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	1355 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	1356 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1357 return dmError(DMERR_NOT_SUPPORTED,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1358 "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	1359 fmt->name);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1360 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1361
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1362 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	1363 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1364 dmMsg(1, "Outputting '%s' image %d x %d -> %d x %d [%d x %d]\n",
1893 334501b6cce5 Use format name instead of file extension in a message. Matti Hamalainen <ccr@tnsp.org> parents: 1891 diff changeset	1365 fmt->name,
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	1366 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	1367 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	1368 spec->scaleX, spec->scaleY);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1369 }
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	1370
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1371 // 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	1372 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	1373 BOOL allocated = FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1374 if (optRemapColors)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1375 {
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	1376 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	1377 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	1378
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	1379 allocated = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1380 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1381
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1382 // Determine number of planes, if paletted
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1383 if (spec->format == DM_COLFMT_PALETTE)
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1384 {
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1385 spec->nplanes = 0;
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1386 for (int n = 8; n >= 0;)
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1387 {
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1388 if ((image->ncolors - 1) & (1 << n))
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1389 {
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1390 spec->nplanes = n + 1;
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1391 break;
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1392 }
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1393 else
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1394 n--;
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1395 }
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1396 }
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1397
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1398 spec->fmtid = fmt->fmtid;
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1399
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1400 // 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	1401 switch (fmt->fmtid)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1402 {
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1403 case DM_IMGFMT_PNG:
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1404 spec->format = optUsePalette ? 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	1405 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	1406
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1407 case DM_IMGFMT_PPM:
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1408 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	1409 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	1410
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1411 case DM_IMGFMT_RAW:
416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	1412 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	1413 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1414 char prefix = NULL, hdrFilename = NULL;
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1415 if ((hdrFilename = dm_strdup_fext(filename, "%s.inc")) == NULL \|\|
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1416 (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	1417 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1418 res = dmError(DMERR_MALLOC,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1419 "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	1420 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	1421 }
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	1422
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1423 // 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	1424 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	1425 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	1426
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1427 if (info)
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1428 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1429 dmMsg(2, "%d bitplanes, %s planes output.\n",
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1430 spec->nplanes,
2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1431 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	1432 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	1433 fmt->fmtid == DM_IMGFMT_ARAW ? "ARAW" : "RAW",
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1434 hdrFilename, prefix);
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	1435 }
1891 91b80990043c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1890 diff changeset	1436
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1437 res = dmWriteIFFMasterRAWHeaderFile(
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1438 hdrFilename, filename, prefix, image, spec);
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1439
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1440 dmFree(prefix);
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1441 dmFree(hdrFilename);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1442 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1443 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	1444
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1445 default:
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1446 spec->format = optUsePalette ? DM_COLFMT_PALETTE : DM_COLFMT_RGB;
1896 f80b2dc77c30 Work begins on IFF ILBM/PBM image writer. It is pretty broken, some things Matti Hamalainen <ccr@tnsp.org> parents: 1893 diff changeset	1447 break;
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1448 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1449
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1450 // 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	1451 if (res == DMERR_OK)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1452 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1453 DMResource *fp;
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1454
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1455 if (info)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1456 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1457 char *str;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1458 switch (spec->format)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1459 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1460 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	1461 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	1462 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	1463 default : str = "???"; break;
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1464 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1465 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	1466 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1467
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1468 if ((res = dmf_open_stdio(filename, "wb", &fp)) != DMERR_OK)
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1469 {
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1470 dmErrorMsg("Could not open file '%s' for writing.\n",
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1471 filename);
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1472 goto err;
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1473 }
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1474
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1475 res = fmt->write(fp, image, spec);
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1476
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1477 dmf_close(fp);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1478 }
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	1479
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	1480 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	1481 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	1482 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	1483
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	1484 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	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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1487
547 ca5ad51c6479 Make dmConvertByte() static. Matti Hamalainen <ccr@tnsp.org> parents: 546 diff changeset	1488 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	1489 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1490 Uint8 byte = 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1491 int xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1492
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1493 if (multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1494 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1495 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	1496 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1497 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	1498 byte \|= pixel << (6 - (xc * 2));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1499 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1500 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1501 else
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1502 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1503 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	1504 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1505 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	1506 byte \|= pixel << (7 - xc);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1507 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1508 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1509
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1510 return byte;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1511 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1512
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1513
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1514 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	1515 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	1516 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1517 int yc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1518
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1519 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1520 xoffs + C64_CHR_WIDTH_PX > image->width \|\|
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1521 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	1522 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1523
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1524 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	1525 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1526 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	1527 buf[yc] = dmConvertByte(sp, multicolor);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1528 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1529
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1530 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1531 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1532
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1533
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1534 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	1535 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	1536 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1537 int yc, xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1538
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1539 if (xoffs < 0 \|\| yoffs < 0 \|\|
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1540 xoffs + C64_SPR_WIDTH_PX > image->width \|\|
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1541 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	1542 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1543
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1544 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	1545 {
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1546 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	1547 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1548 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	1549 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	1550 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1551 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1552
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1553 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1554 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1555
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1556
1928 0b2a2da4c7e7 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1916 diff changeset	1557 int dmWriteSpritesAndChars(const char filename, DMImage image, int outFormat, const BOOL multicolor)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1558 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1559 int ret = DMERR_OK;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1560 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	1561 FILE *outFile = NULL;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1562 Uint8 *buf = NULL;
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1563 size_t outBufSize;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1564 char *outType;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1565
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1566 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1567 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1568 case FFMT_CHAR:
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1569 outBufSize = C64_CHR_SIZE;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1570 outBlockW = image->width / C64_CHR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1571 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	1572 outType = "char";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1573 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1574
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1575 case FFMT_SPRITE:
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1576 outBufSize = C64_SPR_SIZE;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1577 outBlockW = image->width / C64_SPR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1578 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	1579 outType = "sprite";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1580 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1581
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1582 default:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1583 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1584 "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	1585 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1586 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1587
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1588 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	1589 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1590 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1591 "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	1592 outBlockW, outBlockH);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1593 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1594 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1595
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1596 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	1597 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1598 ret = dmGetErrno();
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1599 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	1600 filename, ret, dmErrorStr(ret));
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1601 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1602 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1603
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1604 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	1605 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1606 dmErrorMsg("Could not allocate %d bytes for conversion buffer.\n",
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1607 outBufSize);
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1608 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1609 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1610
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1611 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	1612 outBlockW, outBlockH, outBlockW * outBlockH, outType);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1613
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1614 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	1615 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	1616 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1617 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1618 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1619 case FFMT_CHAR:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1620 if (!dmConvertImage2Char(buf, image,
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1621 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	1622 multicolor))
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1623 {
be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1624 ret = DMERR_DATA_ERROR;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1625 goto error;
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1626 }
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1627 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1628
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1629 case FFMT_SPRITE:
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1630 if (!dmConvertImage2Sprite(buf, image,
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1631 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	1632 multicolor))
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1633 {
be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1634 ret = DMERR_DATA_ERROR;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1635 goto error;
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1636 }
910 43a71b097f17 10L. Matti Hamalainen <ccr@tnsp.org> parents: 909 diff changeset	1637 break;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1638 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1639
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	1640 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	1641 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	1642 ret = dmGetErrno();
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1643 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	1644 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	1645 goto error;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1646 }
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1647 }
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1648
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1649 fclose(outFile);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1650 dmFree(buf);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1651 return 0;
828 c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1652
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1653 error:
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1654 if (outFile != NULL)
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	1655 fclose(outFile);
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	1656 dmFree(buf);
910 43a71b097f17 10L. Matti Hamalainen <ccr@tnsp.org> parents: 909 diff changeset	1657 return ret;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1658 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	1659
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1660
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1661 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	1662 {
1524 532c3ceaec1a Fix uninitilized variable. Matti Hamalainen <ccr@tnsp.org> parents: 1522 diff changeset	1663 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	1664 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	1665
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1666 switch (optInType)
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 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1668 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	1669 outSize = C64_CHR_SIZE;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1670 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	1671 outWidthPX = C64_CHR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1672 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	1673 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1674
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1675 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	1676 outSize = C64_SPR_SIZE;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1677 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	1678 outWidthPX = C64_SPR_WIDTH_PX;
1859 f382cde6bb58 Rename various C64 sprite / character constants. Matti Hamalainen <ccr@tnsp.org> parents: 1852 diff changeset	1679 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	1680 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1681
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1682 default:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1683 return dmError(DMERR_INTERNAL,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1684 "Invalid input format %d, internal error.\n", optInType);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1685 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1686
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1687 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	1688 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	1689
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1690 if (optOutType == FFMT_ANSI \|\| optOutType == 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	1691 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1692 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	1693 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	1694
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1695 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	1696 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	1697 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1698 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	1699 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1700 ret = dmGetErrno();
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1701 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	1702 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	1703 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	1704 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1705
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1706 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	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 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	1709
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1710 switch (optInType)
407 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 case FFMT_CHAR:
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1713 dmDumpCharASCII(outFile, dataBuf + offs, realOffs + offs, optOutType, 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	1714 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1715 case FFMT_SPRITE:
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1716 dmDumpSpriteASCII(outFile, dataBuf + offs, realOffs + offs, optOutType, 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	1717 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1718 }
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1719 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	1720 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1721 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1722
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1723 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	1724 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1725 else
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1726 if (optOutType == 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	1727 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1728 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	1729 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	1730 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	1731
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1732 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	1733 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1734 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	1735 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1736 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	1737 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	1738 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1739
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1740 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	1741 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	1742 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1743 outImage->width, outImage->height,
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	1744 outImage->width * optSpec.scaleX,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	1745 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	1746 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1747 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1748 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1749 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	1750 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	1751 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1752 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	1753 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	1754 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1755
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1756 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	1757 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	1758 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	1759 outIHeight++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1760
1801 0562dd55a1f6 s/DM_IFMT_/DM_COLFMT_/g Matti Hamalainen <ccr@tnsp.org> parents: 1775 diff changeset	1761 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	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
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	1764 dmSetDefaultC64Palette(outImage);
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1765
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1766 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	1767 {
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 826 diff changeset	1768 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	1769 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	1770 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1771 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	1772 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1773 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1774
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1775 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	1776 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1777 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	1778 optOutFilename,
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1779 itemCount,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1780 convFormatList[optOutType].fext);
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1781
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1782 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	1783 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1784 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	1785 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	1786 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1787
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1788 ret = dmWriteImage(outFilename, outImage, &optSpec,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1789 &dmImageFormatList[optOutFormat], TRUE);
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1790 if (ret != DMERR_OK)
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1791 {
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1792 dmErrorMsg("Error writing output image '%s': %s.\n",
9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1793 outFilename, dmErrorStr(ret));
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1794 }
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1795
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1796 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	1797 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1798 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1799 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1800 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	1801 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1802 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	1803 outY++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1804 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1805 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1806
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1807 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	1808 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1809 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1810
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1811 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	1812 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1813 ret = dmWriteImage(optOutFilename, outImage, &optSpec,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1814 &dmImageFormatList[optOutFormat], TRUE);
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1815 if (ret != DMERR_OK)
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1816 {
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	1817 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	1818 optOutFilename, dmErrorStr(ret));
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	1819 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1820 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1821
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1822 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	1823 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1824 else
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1825 if (optOutType == FFMT_BITMAP)
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1826 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1827 if (optSequential)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1828 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1829 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1830 "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	1831 goto error;
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1832 }
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	1833 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1834
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1835 error:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	1836 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	1837 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1838
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1839
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1840 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	1841 {
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	1842 FILE *inFile = NULL;
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	1843 DMC64ImageConvSpec imageSpecC64;
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	1844 const DMC64ImageFormat *inC64Fmt = NULL;
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	1845 DMConvFormat inFormat, outFormat;
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1846 DMC64Image inC64Image = NULL, outC64Image = NULL;
2052 aa8df4f1b785 Fix minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2030 diff changeset	1847 DMImage inImage = NULL, outImage = NULL;
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1848 Uint8 dataBuf = NULL, dataBufOrig = NULL;
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1849 size_t dataSize, dataSizeOrig, dataRealOffs;
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1850 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	1851
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1852 // Default color mapping
1584 f1b279ba47a8 Remove some useless constants. Matti Hamalainen <ccr@tnsp.org> parents: 1569 diff changeset	1853 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	1854 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	1855
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	1856 // Initialize c64 image conversion spec
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	1857 memset(&imageSpecC64, 0, sizeof(imageSpecC64));
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	1858
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1859 // 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	1860 dmC64InitializeFormats();
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1861 nconvFormatList = ndmImageFormatList + nbaseFormatList;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1862 convFormatList = dmCalloc(nconvFormatList, sizeof(DMConvFormat));
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1863
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1864 for (n = i = 0; i < ndmImageFormatList; i++)
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1865 {
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1866 const DMImageFormat *sfmt = &dmImageFormatList[i];
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1867 DMConvFormat *dfmt = &convFormatList[n++];
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1868 dfmt->name = sfmt->name;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1869 dfmt->fext = sfmt->fext;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1870 dfmt->flags = sfmt->flags;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1871 dfmt->type = FFMT_IMAGE;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1872 dfmt->format = sfmt->fmtid;
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1873 }
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1874
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1875 for (i = 0; i < nbaseFormatList; i++)
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1876 memcpy(&convFormatList[n++], &baseFormatList[i], sizeof(DMConvFormat));
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	1877
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1878 // Initialize and parse commandline
1910 1a198212009e Bump gfxconv version. Matti Hamalainen <ccr@tnsp.org> parents: 1909 diff changeset	1879 dmInitProg("gfxconv", "Simple graphics converter", "0.94", 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	1880
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1881 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	1882 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	1883 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	1884
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1885 // Determine input format, if not specified
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1886 if (optInType == 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	1887 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1888 char *dext = strrchr(optInFilename, '.');
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1889 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	1890 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1891 if (dmGetFormatByExt(dext + 1, &optInType, &optInFormat) \|\|
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1892 dmGetC64FormatByExt(dext + 1, &optInType, &optInFormat))
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1893 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1894 dmMsg(3, "Guessed input type as %s\n",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1895 formatTypeList[optInType]);
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1896 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1897 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1898 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1899
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1900 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	1901 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1902 if (optInType == 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	1903 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1904 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	1905 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	1906 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	1907 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1908 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	1909 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	1910 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1911 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1912 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	1913 {
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1914 int res = dmGetErrno();
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1915 dmErrorMsg("Error opening input file '%s', %d: %s\n",
488 49f0ce2cc347 Error printing cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 487 diff changeset	1916 optInFilename, res, dmErrorStr(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1917 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	1918 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1919
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1920 // Determine output format, if not specified
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1921 if (optOutType == FFMT_AUTO && optOutFilename != NULL)
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1922 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1923 char *dext = strrchr(optOutFilename, '.');
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1924 if (dext)
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1925 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1926 if (dmGetFormatByExt(dext + 1, &optOutType, &optOutFormat) \|\|
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1927 dmGetC64FormatByExt(dext + 1, &optOutType, &optOutFormat))
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1928 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1929 dmMsg(3, "Guessed output type as %s\n",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1930 formatTypeList[optOutType]);
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1931 }
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1932 }
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1933 }
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1934 else
1911 794cbb938a58 Do not force output type to FFMT_ASCII if format is set on commandline. Matti Hamalainen <ccr@tnsp.org> parents: 1910 diff changeset	1935 if (optOutType == FFMT_AUTO)
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1936 optOutType = FFMT_ASCII;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1937
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1938 // 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	1939 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	1940
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1941 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	1942 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1943
1664 9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	1944 fclose(inFile);
9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	1945
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1946 // 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	1947 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	1948 {
2010 09d548b08150 Improve input skip option messages. Matti Hamalainen <ccr@tnsp.org> parents: 2006 diff changeset	1949 dmErrorMsg("Input skip value %d (0x%x) is larger than input size %" DM_PRIu_SIZE_T ".\n",
09d548b08150 Improve input skip option messages. Matti Hamalainen <ccr@tnsp.org> parents: 2006 diff changeset	1950 optInSkip, optInSkip, dataSizeOrig);
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1951 goto error;
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1952 }
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1953
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1954 if (optInSkipNeg)
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1955 {
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1956 dataBuf = dataBufOrig + dataSizeOrig - optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1957 dataSize = optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1958 dataRealOffs = dataSizeOrig - optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1959
2010 09d548b08150 Improve input skip option messages. Matti Hamalainen <ccr@tnsp.org> parents: 2006 diff changeset	1960 dmMsg(1, "Input skip -%d (-0x%x). Offset %d (0x%x), size %d (0x%x).\n",
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1961 optInSkip, optInSkip,
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1962 dataRealOffs, dataRealOffs,
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1963 dataSize, dataSize);
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1964
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1965 }
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1966 else
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1967 {
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1968 dataBuf = dataBufOrig + optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1969 dataSize = dataSizeOrig - optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1970 dataRealOffs = optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1971
2010 09d548b08150 Improve input skip option messages. Matti Hamalainen <ccr@tnsp.org> parents: 2006 diff changeset	1972 dmMsg(1, "Input skip %d (0x%x), size %d (0x%x).\n",
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1973 optInSkip, optInSkip,
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1974 dataSize, dataSize);
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	1975 }
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1976
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1977 // Check for forced input format here
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	1978 if (optForcedInSubFormat >= 0)
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1979 optInFormat = optForcedInSubFormat;
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	1980
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1981 // Perform probing, if required
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	1982 if (optInType == FFMT_AUTO \|\| optInType == 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	1983 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1984 // Probe for format
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	1985 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	1986 DMGrowBuf tbuf;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1987 int res;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1988
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	1989 if (optForcedInSubFormat >= 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	1990 {
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	1991 forced = &dmC64ImageFormats[optForcedInSubFormat];
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	1992 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	1993 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	1994 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1995
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1996 res = dmC64DecodeBMP(&inC64Image,
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1997 dmGrowBufConstCreateFrom(&tbuf, dataBuf, dataSize),
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1998 0, 2, &inC64Fmt, forced);
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	1999
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	2000 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	2001 {
1522 0d1cf72fb732 Clarify the "probed" messages of gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1514 diff changeset	2002 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	2003 inC64Fmt->name, inC64Fmt->format->type, inC64Fmt->fext);
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	2004
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2005 optInType = FFMT_BITMAP;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2006 }
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	2007 else
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2008 if (res != DMERR_OK && (forced != NULL \|\| optInType == FFMT_BITMAP))
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	2009 {
1464 73e00bf7531c Improve one error message by showing the error code. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	2010 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	2011 goto error;
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	2012 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2013 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2014
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2015 if (optInType == FFMT_AUTO \|\| optInType == FFMT_IMAGE)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2016 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2017 const DMImageFormat *ifmt = NULL;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	2018 int index;
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	2019 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	2020 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	2021 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2022 optInType = FFMT_IMAGE;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2023 optInFormat = index;
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2024 dmMsg(1, "Probed '%s' format image.\n", ifmt->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	2025 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2026 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2027
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2028 if (optInType == 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	2029 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2030 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	2031 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	2032 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2033
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2034 if (dmGetConvFormat(optInType, optInFormat, &inFormat) &&
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2035 dmGetConvFormat(optOutType, optOutFormat, &outFormat))
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2036 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2037 dmMsg(1, "Attempting conversion %s (%s) -> %s (%s)\n",
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2038 inFormat.name, inFormat.fext,
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2039 outFormat.name, outFormat.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	2040 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2041
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2042 if (optScaleMode != SCALE_SET)
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2043 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2044 int scaleX = 1, scaleY = 1;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2045 if (inC64Fmt != NULL)
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2046 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2047 scaleX = inC64Fmt->format->aspectX;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2048 scaleY = inC64Fmt->format->aspectY;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2049 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2050
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2051 switch (optScaleMode)
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2052 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2053 case SCALE_AUTO:
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2054 optSpec.scaleX = scaleX;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2055 optSpec.scaleY = scaleY;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2056 break;
2070 41df24d1dfb6 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2065 diff changeset	2057
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2058 case SCALE_RELATIVE:
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2059 optSpec.scaleX *= scaleX;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2060 optSpec.scaleY *= scaleY;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2061 break;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2062 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2063 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2064
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2065 switch (optInType)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2066 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2067 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2068 case FFMT_CHAR:
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2069 dmDumpSpritesAndChars(dataBuf, dataSize, dataRealOffs);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2070 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2071
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2072 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	2073 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2074 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	2075
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2076 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	2077 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2078 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	2079 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2080 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2081
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2082 switch (optOutType)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2083 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2084 case FFMT_IMAGE:
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2085 case FFMT_CHAR:
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2086 case FFMT_SPRITE:
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2087 res = dmC64ConvertBMP2Image(&outImage, inC64Image, inC64Fmt, &imageSpecC64);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2088
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	2089 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	2090 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2091 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	2092 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2093 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2094
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2095 switch (optOutType)
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2096 {
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2097 case FFMT_IMAGE:
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2098 res = dmWriteImage(optOutFilename, outImage, &optSpec,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2099 &dmImageFormatList[optOutFormat], TRUE);
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2100 break;
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2101
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2102 case FFMT_CHAR:
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2103 case FFMT_SPRITE:
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2104 res = dmWriteSpritesAndChars(optOutFilename, outImage,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2105 optOutType, optInMulticolor);
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2106 break;
b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2107 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2108 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2109
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	2110 case FFMT_BITMAP:
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2111 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2112 &dmC64ImageFormats[optOutFormat], inC64Fmt)) != DMERR_OK)
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	2113 {
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	2114 dmErrorMsg("Error in bitmap format conversion.\n");
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	2115 goto error;
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	2116 }
1843 bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	2117 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	2118 {
bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	2119 dmPrint(0, "INPUT:\n"); dmC64ImageDump(stderr, inC64Image, inC64Fmt, " ");
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2120 dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutFormat], " ");
1843 bda7f82f221e Add C64 image format info dumps for verbosity level 2 when converting. Matti Hamalainen <ccr@tnsp.org> parents: 1842 diff changeset	2121 }
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2122 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	2123 break;
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	2124
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2125 default:
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2126 dmErrorMsg("Unsupported output format for bitmap conversion.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2127 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2128 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2129
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2130 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2131 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2132
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2133 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2134 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2135 const DMImageFormat *ifmt = &dmImageFormatList[optInFormat];
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2136 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	2137 DMResource *fp;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2138
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2139 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2140 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2141 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	2142 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	2143 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2144
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	2145 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	2146 {
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	2147 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	2148 goto error;
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	2149 }
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	2150
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2151 // Read input
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2152 if (ifmt->read != NULL)
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2153 res = ifmt->read(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	2154 else
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2155 dmErrorMsg("Unsupported input image format for image conversion.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	2156
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	2157 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	2158
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	2159 if (res != DMERR_OK \|\| inImage == NULL)
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2160 goto error;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2161
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2162 switch (optOutType)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2163 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2164 case FFMT_IMAGE:
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2165 res = dmWriteImage(optOutFilename, inImage, &optSpec,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2166 &dmImageFormatList[optOutFormat], 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	2167 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	2168
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2169 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2170 case FFMT_SPRITE:
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2171 res = dmWriteSpritesAndChars(optOutFilename, inImage,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2172 optOutType, optInMulticolor);
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2173 break;
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2174
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2175 case FFMT_BITMAP:
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2176 {
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2177 DMC64Image *tmpC64Image = NULL;
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2178 res = dmC64ConvertImage2BMP(&tmpC64Image, inImage,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2179 &dmC64ImageFormats[optOutFormat], &imageSpecC64);
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2180
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2181 if (res != DMERR_OK \|\| tmpC64Image == NULL)
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2182 {
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2183 dmC64ImageFree(tmpC64Image);
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2184 dmErrorMsg("Error in image to bitmap conversion: %s\n",
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2185 dmErrorStr(res));
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2186 goto error;
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2187 }
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2188
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2189 if ((res = dmConvertC64Bitmap(&outC64Image, tmpC64Image,
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2190 &dmC64ImageFormats[optOutFormat], &dmC64ImageFormats[optOutFormat])) != DMERR_OK)
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2191 {
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2192 dmC64ImageFree(tmpC64Image);
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2193 dmErrorMsg("Error in bitmap format conversion: %s\n",
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2194 dmErrorStr(res));
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2195 goto error;
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2196 }
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2197
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2198 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2199 dmC64ImageFree(tmpC64Image);
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2200 }
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2201 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2202
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	2203 default:
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	2204 dmErrorMsg("Unsupported output format for image conversion.\n");
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	2205 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	2206 }
806 1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	2207
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	2208 if (res != DMERR_OK)
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	2209 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2210 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	2211 dmErrorStr(res));
1e4d88fbce19 Error handling. Matti Hamalainen <ccr@tnsp.org> parents: 799 diff changeset	2212 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2213 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2214 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2215 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2216
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	2217 error:
1664 9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	2218 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	2219 dmFree(dataBufOrig);
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	2220 dmC64ImageFree(inC64Image);
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	2221 dmC64ImageFree(outC64Image);
2052 aa8df4f1b785 Fix minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2030 diff changeset	2222 dmImageFree(inImage);
aa8df4f1b785 Fix minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2030 diff changeset	2223 dmImageFree(outImage);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2224
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	2225 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	2226 }

Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 2077:838ed06b3927