dmlib: tools/gfxconv.c annotate

annotate tools/gfxconv.c @ 2503:7b55c7b6a300

Clarify the help for -R sub-option "max=".

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 28 Apr 2020 22:56:45 +0300
parents	19e546da038f
children	f90a97aef546

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
2371 82cb32297ed2 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 2369 diff changeset	4 * (C) Copyright 2012-2020 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"
2204 cbac4912992c Add new module "lib64util", and move some functions there from lib64gfx Matti Hamalainen <ccr@tnsp.org> parents: 2201 diff changeset	14 #include "lib64util.h"
1433 d8a83582f78f Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1432 diff changeset	15 #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	16
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	18 #define DM_MAX_COLORS 256
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	19
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	20 #define DM_ASC_NBITS 8
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	21 #define DM_ASC_NCOLORS 4
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	22 static const char dmASCIIPalette[DM_ASC_NCOLORS] = ".:X#";
5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	23
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	24
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 enum
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	27 FFMT_AUTO = 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	28
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	29 FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	30 FFMT_ANSI,
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	31 FFMT_BITMAP,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	32 FFMT_CHAR,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	33 FFMT_SPRITE,
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	34
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	35 FFMT_IMAGE,
2226 6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	36 FFMT_DUMP,
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	37 FFMT_PALETTE,
407 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 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	40 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	42
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	43 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	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 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	46 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	47 };
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	48
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	49
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	50 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	51 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	52 "AUTO",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	53 "ASCII text",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	54 "ANSI text",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	55 "C64 bitmap image",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	56 "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	57 "C64 sprite data",
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	58 "Image",
2360 8f015ef431a3 Add missing description string to formatTypeList[]. Matti Hamalainen <ccr@tnsp.org> parents: 2359 diff changeset	59 "CDump",
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	60 "Palette",
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	61 };
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	62
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	63
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	64 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	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 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	67 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	68 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	69 };
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	70
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	71
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	72 enum
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 SCALE_SET,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	75 SCALE_RELATIVE,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	76 SCALE_AUTO,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	77 };
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	78
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	79
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	80 enum
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	81 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	82 REMAP_NONE = 0,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	83 REMAP_AUTO,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	84 REMAP_MAPPED,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	85 };
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	86
2501 62b7dfd5bfa5 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 2500 diff changeset	87
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	88 typedef struct
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	89 {
1340 1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	90 char *name; // Descriptive name of the format
1f8687c61891 Add some comments. Matti Hamalainen <ccr@tnsp.org> parents: 1330 diff changeset	91 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	92 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	93 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	94 int format; // Subformat identifier
2103 78a9140f02b1 Improve help for spr/chr formats by listing the :mc and :sc flags at their Matti Hamalainen <ccr@tnsp.org> parents: 2100 diff changeset	95 char *help;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	96 } DMConvFormat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	97
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	98
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	99 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	100 {
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	101 { "ASCII text" , "asc" , DM_FMT_WR , FFMT_ASCII , 0 , NULL },
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	102 { "ANSI colored text" , "ansi" , DM_FMT_WR , FFMT_ANSI , 0 , NULL },
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	103 { "C64 bitmap image" , "bitmap", DM_FMT_RDWR , FFMT_BITMAP , -1 , NULL },
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	104 { "C64 character/font data" , "chr" , DM_FMT_RDWR , FFMT_CHAR , 0 , " (chr:mc/chr:sc for multi/singlecolor)" },
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	105 { "C64 sprite data" , "spr" , DM_FMT_RDWR , FFMT_SPRITE , 0 , " (spr:mc/spr:sc for multi/singlecolor)" },
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	106 { "C64 bitmap image dump" , "dump" , DM_FMT_WR , FFMT_DUMP , 0 , NULL },
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	107 { "Palette data" , "pal" , DM_FMT_RDWR , FFMT_PALETTE , -1 , 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	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
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	110 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	111
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	112
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	113 static DMConvFormat *convFormatList = NULL;
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	114 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	115
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	117 typedef struct
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	118 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	119 BOOL triplet, alpha;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	120 DMColor color;
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	121 unsigned int from, to;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	122 } DMMapValue;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	123
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 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	127 *optOutFilename = NULL;
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	128
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	129 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	130 optOutType = FFMT_AUTO,
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	131 optInFormat = -1,
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	132 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	133 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	134 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	135 optForcedInSubFormat = -1;
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	136 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	137 BOOL optInSkipNeg = FALSE;
838 f2ac9877263e Bitmap format specifying option changes. Matti Hamalainen <ccr@tnsp.org> parents: 837 diff changeset	138
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	139 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	140 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	141 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	142
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 BOOL optInMulticolor = FALSE,
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	144 optSequential = FALSE,
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	145 optRemapRemove = FALSE,
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	146 optRemapMatchAlpha = FALSE,
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	147 optUsePalette = FALSE;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	148 int optRemapMode = REMAP_NONE;
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	149 int optNRemapTable = 0,
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	150 optScaleMode = SCALE_AUTO;
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	151 float optRemapMaxDist = -1;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	152 int optRemapNoMatchColor = -1;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	153 DMMapValue optRemapTable[DM_MAX_COLORS];
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	154 int optColorMap[D64_NCOLORS];
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	155 char *optCharROMFilename = NULL;
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	156 DMC64Palette *optC64Palette = NULL;
2214 f8bba7a82ec2 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	157 char *optPaletteFile = NULL;
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	158 DMPalette *optPaletteData = NULL;
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	159
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160
2156 e6ec7fad9ce2 Rename DMImageConvSpec to DMImageWriteSpec to better reflec the struct's purpose. Matti Hamalainen <ccr@tnsp.org> parents: 2155 diff changeset	161 DMImageWriteSpec optSpec =
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	162 {
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	163 .scaleX = 1,
c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	164 .scaleY = 1,
2099 dac89484f143 Fix nplanes and bpp in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2097 diff changeset	165 .nplanes = 0,
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	166 .bpp = 8,
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	167 .planar = FALSE,
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	168 .pixfmt = 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	169 .compression = FCMP_BEST,
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	170 };
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	172 DMC64ImageConvSpec optC64Spec;
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	173
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	174
860 daebbf28953d The argument handling API in dmargs* was synced with th-libs. Matti Hamalainen <ccr@tnsp.org> parents: 854 diff changeset	175 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	176 {
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	177 { 0, '?', "help" , "Show this help", OPT_NONE },
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	178 { 3, 0, "longhelp" , "Show a longer help", OPT_NONE },
2410 bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	179 { 1, 0, "license" , "Print out this program's license agreement", OPT_NONE },
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	180 { 2, 'v', "verbose" , "Be more verbose", OPT_NONE },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	181
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	182 { 10, 'o', "output" , "Output filename", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	183 { 12, 's', "skip" , "Skip N bytes in input from start (negative value will be offset from input end)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	184 { 14, 'i', "informat" , "Set input format (see --formats)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	185 { 16, 'f', "format" , "Set output format (see --formats)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	186 { 18, 'F', "formats" , "List supported input/output formats", OPT_NONE },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	187 { 20, 'q', "sequential" , "Output sequential files (image output only)", OPT_NONE },
2495 88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	188 { 22, 'm', "colormap" , "Set color map definitions (see '-m help')", OPT_ARGREQ },
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	189 { 24, 'n', "numitems" , "How many 'items' to output (default: all)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	190 { 26, 'w', "width" , "Item width (number of items per row, min 1)", OPT_ARGREQ },
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	191 { 28, 'S', "scale" , "Scale output image by specified value(s) (see '-S help')", OPT_ARGREQ },
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	192 { 30, 'P', "paletted" , "Use indexed/paletted output IF possible.", OPT_NONE },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	193 { 32, 'N', "nplanes" , "# of bitplanes (some output formats)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	194 { 34, 'B', "bpp" , "Bits per plane (some output formats)", OPT_ARGREQ },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	195 { 36, 'I', "interleave" , "Interleaved/planar output (some output formats)", OPT_NONE },
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	196 { 38, 'C', "compress" , "Use compression -C <0-9>, 0 = disable, default is 9", OPT_ARGREQ },
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	197 { 42, 'R', "remap" , "Remap output image colors (see '-R help')", OPT_ARGREQ },
2413 902cc22018a1 Option index adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	198 { 44, 0, "char-rom" , "Set character ROM file to be used.", OPT_ARGREQ },
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	199 { 46, 'p', "palette" , "Set palette to be used (see '-p help'). "
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	200 "For paletted image file input, this will replace the "
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	201 "image's original palette. Color remapping will not be "
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	202 "done unless -R option is also specified.", 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	203 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 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	206
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	208 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	209 {
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	210 printf(
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	211 "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	212 " frmt \| RW \| Description\n"
3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	213 "------+----+-------------------------------------------------------\n"
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	214 );
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	215
1532 74febc66d90d Cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1526 diff changeset	216 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	217 {
1545 3b613fcbf3ff Improve how format read/write capabilities are marked and shown. Matti Hamalainen <ccr@tnsp.org> parents: 1543 diff changeset	218 const DMConvFormat *fmt = &convFormatList[i];
2103 78a9140f02b1 Improve help for spr/chr formats by listing the :mc and :sc flags at their Matti Hamalainen <ccr@tnsp.org> parents: 2100 diff changeset	219 printf("%-6s\| %c%c \| %s%s\n",
432 b583a682f12d Improve listing of input/output formats in --help. Matti Hamalainen <ccr@tnsp.org> parents: 431 diff changeset	220 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	221 (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	222 (fmt->flags & DM_FMT_WR) ? 'W' : ' ',
2103 78a9140f02b1 Improve help for spr/chr formats by listing the :mc and :sc flags at their Matti Hamalainen <ccr@tnsp.org> parents: 2100 diff changeset	223 fmt->name,
78a9140f02b1 Improve help for spr/chr formats by listing the :mc and :sc flags at their Matti Hamalainen <ccr@tnsp.org> parents: 2100 diff changeset	224 fmt->help != NULL ? fmt->help : "");
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	227 printf(
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	228 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	229 "(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	230 "\n"
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	231 );
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	232
2242 65a2c2e99c81 Move listing of C64 formats function to argShowC64Formats in lib64util. Matti Hamalainen <ccr@tnsp.org> parents: 2237 diff changeset	233 argShowC64Formats(stdout, TRUE);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	234 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	235
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	236
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	237 void argShowHelp(void)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	238 {
2442 07b02bb63191 Input file argument is optional for some cases, where stdin can be used. Matti Hamalainen <ccr@tnsp.org> parents: 2414 diff changeset	239 dmPrintBanner(stdout, dmProgName, "[options] [<input file>]");
2402 b7cd5dd0b82e Merge one more change from th-libs args processing. Matti Hamalainen <ccr@tnsp.org> parents: 2389 diff changeset	240 dmArgsPrintHelp(stdout, optList, optListN, 0, 80 - 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	241
2236 57ccd949093f Show the default chargen/character ROM file path in help. Matti Hamalainen <ccr@tnsp.org> parents: 2230 diff changeset	242 fprintf(stdout,
837 5333dd4a99e4 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 829 diff changeset	243 "\n"
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	244 "Default C64 character ROM file for this build is:\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	245 "%s\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	246 "\n",
2236 57ccd949093f Show the default chargen/character ROM file path in help. Matti Hamalainen <ccr@tnsp.org> parents: 2230 diff changeset	247 DM_DEF_CHARGEN
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248 );
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	252 const char * argGetHelpTopic(const int opt)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	253 {
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	254 switch (opt)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	255 {
2495 88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	256 case 22:
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	257 return
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	258 "Color map definitions (-m)\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	259 "--------------------------\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	260 "Color map definitions are used for sprite/char data input (and ANSI text\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	261 "output), to set what colors of the C64 palette are used for each single\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	262 "color/multi color bit-combination.\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	263 "\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	264 "For example, if the input is multi color sprite or char, you can define\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	265 "colors like: -m 0,8,3,15 .. for hires/single color: -m 0,1\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	266 "\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	267 "The numbers are palette indexes, and the order is for bit(pair)-values\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	268 "00, 01, 10, 11 (multi color) and 0, 1 (single color).\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	269 "\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	270 "NOTICE! 255 is a special transparency color index; -m 255,2 would use\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	271 "transparency for '0' bits and and C64 color 2 for '1' bits.\n";
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	272
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	273 case 28:
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	274 return
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	275 "Output image scaling (-S)\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	276 "-------------------------\n"
2495 88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	277 "Scaling can be done in direct or relative mode with integer scale factors.\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	278 "\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	279 "'-S [*]<n>' sets both height and width scale factor to <n> directly or\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	280 " relative to the certain input format's default aspect/scale factors.\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	281 "\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	282 "'-S <W>:<H>[<n>]' scales width by Wn and height H*n.\n"
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	283 " If <n> is not specified, it defaults to 1.\n";
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	284
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	285 case 42:
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	286 return
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	287 "Palette remapping (-R)\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	288 "----------------------\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	289 "Indexed palette color remapping can be performed via the '-R' option in\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	290 "several different ways:\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	291 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	292 " 1) '-R auto'\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	293 " will remap input image to a destination palette specified with the\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	294 " '-p' option (which may be a supported palette file, another paletted\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	295 " image file, or one of the internal gfxconv palettes, see '-p help')\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	296 "\n"
2498 2e38e1512a22 Fix/clarify an explanation in '-R' option help. Matti Hamalainen <ccr@tnsp.org> parents: 2497 diff changeset	297 " Example: '-R auto+remove -p pepto' would remap the input image to the\n"
2e38e1512a22 Fix/clarify an explanation in '-R' option help. Matti Hamalainen <ccr@tnsp.org> parents: 2497 diff changeset	298 " internal Pepto's C64 palette, removing any unused palette entries.\n"
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	299 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	300 " 2) '-R <(#RRGGBBaa\|index):index>[,<#RRGGBBaa\|index>:index]'\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	301 " can be used to specify single RGB(A) color quadruplets/triplets or\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	302 " palette indices to be remapped to destination palette indices. Any\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	303 " Unspecified indices will be automatically mapped. Specifying alpha\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	304 " channel is optional, and will require +alpha flag to be enabled for\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	305 " comparisions.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	306 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	307 " Example: '-R #000000:0,#ffffff:1' would map black and white to indices 0 and 1.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	308 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	309 " 3) '-R @<filename>'\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	310 " can be used to specify a mapping file, which is a text file with one\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	311 " remap definition per line in same format as above. All empty lines and\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	312 " lines starting with a semicolor (;) will be ignored as comments. Also\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	313 " any extra whitespace separating items will be ignored as well.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	314 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	315 "Optional modifier flags can be specified as well:\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	316 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	317 " +remove Remove all unused colors from the resulting palette.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	318 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	319 " +alpha Enable alpha value matching in color comparisions.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	320 " NOTE! This may result in unexpected behaviour.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	321 "\n"
2503 7b55c7b6a300 Clarify the help for -R sub-option "max=". Matti Hamalainen <ccr@tnsp.org> parents: 2502 diff changeset	322 " +max=<f> Set the maximum color distance/delta acceptable for\n"
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	323 " matching colors. Default is -1, meaning closest possible\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	324 " that can be found even if the match is poor. Any value \n"
2503 7b55c7b6a300 Clarify the help for -R sub-option "max=". Matti Hamalainen <ccr@tnsp.org> parents: 2502 diff changeset	325 " above or equal to 0 will be considered strict limit, see\n"
7b55c7b6a300 Clarify the help for -R sub-option "max=". Matti Hamalainen <ccr@tnsp.org> parents: 2502 diff changeset	326 " the 'nomatch' modifier below.\n"
7b55c7b6a300 Clarify the help for -R sub-option "max=". Matti Hamalainen <ccr@tnsp.org> parents: 2502 diff changeset	327 " Range: -1, 0 .. 1.0\n"
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	328 "\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	329 " +nomatch=<n>\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	330 " If no acceptable match is found (see +max modifier)\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	331 " then use this (<n>) color index. This may have unexpected\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	332 " results with +remove modifier. The default value of 'n'\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	333 " is -1, which will result in error if no match is found.\n"
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	334 "";
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	335
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	336 default:
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	337 return NULL;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	338 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	339 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	340
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	341
2447 b0f25a42fd23 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2442 diff changeset	342 //
b0f25a42fd23 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2442 diff changeset	343 // Replace filename extension based on format pattern.
b0f25a42fd23 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2442 diff changeset	344 // Usage: res = dm_strdup_fext(orig_filename, "foo_%s.cmp");
b0f25a42fd23 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2442 diff changeset	345 //
2079 9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	346 char dm_strdup_fext(const char filename, const char *fmt)
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	347 {
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	348 char result, tmp, *fext;
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	349
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	350 if (filename == NULL \|\|
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	351 (tmp = dm_strdup(filename)) == NULL)
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	352 return NULL;
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	353
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	354 if ((fext = strrchr(tmp, '.')) != NULL)
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	355 {
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	356 char *fpath = strrchr(tmp, DM_DIR_SEPARATOR);
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	357 if (fpath == NULL \|\| (fpath != NULL && fext > fpath))
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	358 *fext = 0;
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	359 }
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	360
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	361 result = dm_strdup_printf(fmt, tmp);
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	362
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	363 dmFree(tmp);
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	364
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	365 return result;
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	366 }
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	367
9b6027d51f76 Move dm_strdup_fext() and dm_basefilename() to gfxconv, as they are only used there. Matti Hamalainen <ccr@tnsp.org> parents: 2077 diff changeset	368
1866 734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	369 //
734234e7ca95 Add a comment about the imperfection of ANSI color output. Matti Hamalainen <ccr@tnsp.org> parents: 1865 diff changeset	370 // 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	371 // 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	372 // 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	373 //
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	374 const char *dmC64GetANSIFromC64Color(const int col)
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	375 {
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	376 switch (col)
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	377 {
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	378 case 0: return "0;30"; // Black
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	379 case 1: return "0;1;37"; // White
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	380 case 2: return "0;31"; // Red
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	381 case 3: return "0;36";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	382 case 4: return "0;35";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	383 case 5: return "0;32";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	384 case 6: return "0;34";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	385 case 7: return "0;1;33";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	386 case 8: return "0;33";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	387 case 9: return "0;31";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	388 case 10: return "0;1;31";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	389 case 11: return "0;1;30";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	390 case 12: return "0;1;30";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	391 case 13: return "0;1;32";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	392 case 14: return "0;1;34";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	393 case 15: return "0;37";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	394
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	395 default: return "0";
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	396 }
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	397 }
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	398
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	399
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	400 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	401 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	402 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	403 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	404 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	405 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	406 fmt->format == format)
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	407 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	408 memcpy(pfmt, fmt, sizeof(DMConvFormat));
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	409 return TRUE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	410 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	411 }
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	412
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	413 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	414 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	415 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	416 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	417 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	418 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	419 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	420 memcpy(pfmt, fmt, sizeof(DMConvFormat));
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	421 pfmt->fext = cfmt->name;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	422 return TRUE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	423 }
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	424 }
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	425
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	426 return FALSE;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	427 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	428
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	429
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	430 BOOL dmGetC64FormatByExt(const char fext, int type, int *format)
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	431 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	432 if (fext == NULL)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	433 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	434
1569 7e6af32c8032 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1550 diff changeset	435 for (int i = 0; i < ndmC64ImageFormats; i++)
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	436 {
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	437 const DMC64ImageFormat *fmt = &dmC64ImageFormats[i];
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	438 if (fmt->fext != NULL &&
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	439 strcasecmp(fext, fmt->fext) == 0)
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	440 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	441 *type = FFMT_BITMAP;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	442 *format = i;
819 0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	443 return TRUE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	444 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	445 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	446
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	447 return FALSE;
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	448 }
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	449
0177d4a66d48 Split dmGetFormatByExt() to dmGetC64FormatByExt(). Matti Hamalainen <ccr@tnsp.org> parents: 818 diff changeset	450
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	451 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	452 {
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	453 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	454 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	455
1569 7e6af32c8032 Minor cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 1550 diff changeset	456 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	457 {
1546 228e71d66089 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1545 diff changeset	458 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	459 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	460 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	461 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	462 *type = fmt->type;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	463 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	464 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	465 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	466 }
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	467
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	468 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	469 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	470
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	471
2454 375da267d994 Un-staticize functions in the main program. Matti Hamalainen <ccr@tnsp.org> parents: 2453 diff changeset	472 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	473 {
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	474 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	475
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	476 if (opt == NULL)
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	477 goto out;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	478
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	479 if ((end = split = strchr(opt, ':')) == NULL)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	480 {
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	481 dmErrorMsg("Invalid %s value '%s', expected <(#\|%%)RRGGBB\|[$\|0x]index>:<[$\|0x]index>.\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	482 msg, opt);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	483 goto out;
473 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
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	486 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	487 *end = 0;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	488 for (end--; end > opt && end && isspace(end); end--)
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	489 *end = 0;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	490
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	491 // 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	492 if (opt == '#' \|\| opt == '%')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	493 {
867 56e12109b936 Portability warning fixes. Matti Hamalainen <ccr@tnsp.org> parents: 860 diff changeset	494 unsigned int colR, colG, colB, colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	495
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	496 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	497 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	498 {
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	499 value->alpha = TRUE;
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	500 value->color.a = colA;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	501 }
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	502 else
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	503 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	504 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	505 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	506 dmErrorMsg("Invalid %s value '%s', expected a hex triplet, got '%s'.\n", msg, popt, opt + 1);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	507 goto out;
474 95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	508 }
95d1facfdb77 Improve color matching, make it possible to ignore alpha values. Matti Hamalainen <ccr@tnsp.org> parents: 473 diff changeset	509
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	510 value->color.r = colR;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	511 value->color.g = colG;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	512 value->color.b = colB;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	513 value->triplet = TRUE;
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 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	516 {
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	517 if (!dmGetIntVal(opt, &value->from, NULL))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	518 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	519 dmErrorMsg("Invalid %s value '%s', could not parse source value '%s'.\n", msg, popt, opt);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	520 goto out;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	521 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	522 value->triplet = FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	523 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	524
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	525 // Trim whitespace
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	526 split++;
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	527 while (split && isspace(split)) split++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	528
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	529 // Parse destination value
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	530 if (!dmGetIntVal(split, &value->to, NULL))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	531 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	532 dmErrorMsg("Invalid %s value '%s', could not parse destination value '%s'.\n", msg, popt, split);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	533 goto out;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	534 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	535
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	536 if (!value->triplet && value->from > 255)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	537 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	538 dmErrorMsg("Invalid %s map source color index value %d, must be [0..255].\n", msg, value->from);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	539 goto out;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	540 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	541
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	542 if (value->to > nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	543 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	544 dmErrorMsg("Invalid %s map destination color index value %d, must be [0..%d].\n", msg, value->to, nmax);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	545 goto out;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	546 }
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	547
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	548 dmFree(opt);
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	549 return TRUE;
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	550
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	551 out:
481 c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	552 dmFree(opt);
c3f0fca5b596 Improve remapping option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 480 diff changeset	553 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	554 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	555
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	556
2454 375da267d994 Un-staticize functions in the main program. Matti Hamalainen <ccr@tnsp.org> parents: 2453 diff changeset	557 BOOL dmParseMapOptionItem(char opt, char end, void pvalue, const int index, const int nmax, const BOOL requireIndex, const char msg)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	558 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	559 // Trim whitespace
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	560 if (end != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	561 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	562 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	563 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	564 *end = 0;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	565 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	566 while (opt && isspace(opt)) opt++;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	567
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	568 // Parse item based on mode
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	569 if (requireIndex)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	570 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	571 DMMapValue value = (DMMapValue ) pvalue;
475 c0dedfef3edf Fix option parsing of mappings. Matti Hamalainen <ccr@tnsp.org> parents: 474 diff changeset	572 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	573 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	574 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	575 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	576 {
871 fc272f5f2d15 Make value type of dmGetIntVal() unsigned. Matti Hamalainen <ccr@tnsp.org> parents: 867 diff changeset	577 unsigned int value = (unsigned int ) pvalue;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	578 char *split = strchr(opt, ':');
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	579 if (split != NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	580 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	581 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	582 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	583 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	584
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	585 if (!dmGetIntVal(opt, &value[index], NULL))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	586 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	587 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	588 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	589 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	590 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	591
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	592 return TRUE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	593 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	594
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	595
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	596 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	597 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	598 char *start = opt;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	599
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	600 *nvalues = 0;
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	601 while (start && nvalues < nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	602 {
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	603 char *end = strchr(start, ',');
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	604
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	605 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	606 return FALSE;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	607
853 b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	608 (*nvalues)++;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	609
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	610 if (!end)
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	611 break;
b2140d41785a Cleanup some parsing logic. Matti Hamalainen <ccr@tnsp.org> parents: 838 diff changeset	612
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	613 start = end + 1;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	614 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	615
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	616 return TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	617 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	618
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	619
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	620 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	621 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	622 FILE *fp;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	623 char line[512];
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	624 int res = DMERR_OK;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	625
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	626 if ((fp = fopen(filename, "r")) == NULL)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	627 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	628 res = dmGetErrno();
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	629 return dmError(res, "Could not open color remap file '%s' for reading: %s.\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	630 filename, dmErrorStr(res));
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	631 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	632
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	633 while (fgets(line, sizeof(line), fp))
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	634 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	635 char *start = line;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	636 line[sizeof(line) - 1] = 0;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	637
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	638 while (start && isspace(start)) start++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	639
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	640 if (start != 0 && start != ';')
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	641 {
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	642 if (!dmParseMapOptionMapItem(line, &values[*nvalue], nmax, "mapping file"))
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	643 goto out;
2448 cd5805f392a9 Remove useless else and block. Matti Hamalainen <ccr@tnsp.org> parents: 2447 diff changeset	644
cd5805f392a9 Remove useless else and block. Matti Hamalainen <ccr@tnsp.org> parents: 2447 diff changeset	645 (*nvalue)++;
cd5805f392a9 Remove useless else and block. Matti Hamalainen <ccr@tnsp.org> parents: 2447 diff changeset	646 if (*nvalue >= nmax)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	647 {
2448 cd5805f392a9 Remove useless else and block. Matti Hamalainen <ccr@tnsp.org> parents: 2447 diff changeset	648 dmErrorMsg("Too many mapping pairs in '%s', maximum is %d.\n",
cd5805f392a9 Remove useless else and block. Matti Hamalainen <ccr@tnsp.org> parents: 2447 diff changeset	649 filename, nmax);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	650 goto out;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	651 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	652 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	653 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	654
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	655 out:
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	656 fclose(fp);
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	657 return res;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	658 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	659
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	660
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	661 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	662 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	663 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	664 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	665 *flags++ = 0;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	666
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	667 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	668 !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	669 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	670 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	671 msg1, optArg);
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	672 return FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	673 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	674
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	675 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	676 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	677 switch (*format)
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	678 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	679 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	680 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	681 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	682 optInMulticolor = TRUE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	683 else
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	684 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	685 optInMulticolor = FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	686 else
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	687 {
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	688 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	689 msg1, flags);
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	690 return FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	691 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	692 break;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	693
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	694 default:
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	695 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	696 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	697 return FALSE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	698 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	699 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	700
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	701 return TRUE;
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	702 }
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	703
15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	704
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	705 char dmParseValWithSep(char arg, char last, BOOL (isok)(const int ch), const char sep)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	706 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	707 char ptr = arg, end, start;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	708
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	709 // Skip any whitespace at start
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	710 while (ptr != 0 && isspace(ptr))
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	711 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	712
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	713 start = ptr;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	714
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	715 // Find next not-xdigit/separator
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	716 while (ptr != 0 && (isok == NULL \|\| isok(ptr)) &&
2485 fce2ed3f681f Change dmParseIntValWithSep() separator spec from char to char , to specify Matti Hamalainen <ccr@tnsp.org>* parents: 2484 diff changeset	717 strchr(sep, *ptr) == NULL)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	718 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	719
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	720 end = ptr;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	721
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	722 // Skip whitespace again
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	723 while (ptr != 0 && isspace(ptr))
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	724 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	725
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	726 // Return last character in "last"
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	727 last = ptr;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	728
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	729 // Set end to NUL
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	730 *end = 0;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	731
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	732 // And if last character is not NUL, move ptr
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	733 if (*last != 0)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	734 ptr++;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	735
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	736 *arg = ptr;
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	737
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	738 return start;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	739 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	740
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	741
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	742 BOOL dmParseIntValTok(const int ch)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	743 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	744 return isxdigit(ch) \|\| ch == 'x' \|\| ch == '$';
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	745 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	746
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	747
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	748 BOOL dmParseIntValWithSep(char *arg, unsigned int value, char last, const char sep)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	749 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	750 return dmGetIntVal(dmParseValWithSep(arg, last, dmParseIntValTok, sep), value, NULL);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	751 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	752
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	753
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754 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	755 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	756 unsigned int tmpUInt;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	757 char *tmpStr;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	758
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 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	760 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 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	762 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 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	764 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	766 case 3:
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	767 argShowHelp();
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	768 argShowFormats();
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	769 argShowC64PaletteHelp(stdout);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	770
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	771 for (int n = 0; n < optListN; n++)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	772 {
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	773 const char *str = argGetHelpTopic(optList[n].id);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	774 if (str != NULL)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	775 fprintf(stdout, "\n%s\n", str);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	776 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	777 exit(0);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	778 break;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	779
2410 bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	780 case 1:
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	781 dmPrintLicense(stdout);
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	782 exit(0);
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	783 break;
bc05bcfc4598 Add a C file with the generic BSD license text and a function for Matti Hamalainen <ccr@tnsp.org> parents: 2408 diff changeset	784
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	785 case 2:
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	786 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	787 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	788
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	789 case 10:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	790 optOutFilename = optArg;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	791 break;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	792
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	793 case 12:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	794 if (!dmGetIntVal(optArg, &optInSkip, &optInSkipNeg))
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	795 {
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	796 dmErrorMsg("Invalid skip value argument '%s'.\n", optArg);
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	797 return FALSE;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	798 }
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	799 break;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	800
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	801 case 14:
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	802 {
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	803 DMConvFormat fmt;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	804
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	805 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	806 return FALSE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	807
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	808 dmGetConvFormat(optInType, optForcedInSubFormat, &fmt);
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	809 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	810 {
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	811 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	812 fmt.name);
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	813 return FALSE;
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	814 }
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	815 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	817
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	818 case 16:
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	819 {
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	820 DMConvFormat fmt;
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	821
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	822 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	823 return FALSE;
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	824
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	825 dmGetConvFormat(optOutType, optOutFormat, &fmt);
1870 1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	826 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	827 {
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	828 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	829 fmt.name);
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	830 return FALSE;
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	831 }
1e8f60ce21d1 Add check for writability in output format option -f Matti Hamalainen <ccr@tnsp.org> parents: 1869 diff changeset	832 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	835 case 18:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	836 argShowFormats();
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	837 exit(0);
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	838 break;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	839
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	840 case 20:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	841 optSequential = TRUE;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	842 break;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	843
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	844 case 22:
2495 88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	845 if (strcasecmp(optArg, "help") == 0)
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	846 {
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	847 fprintf(stdout, "\n%s\n", argGetHelpTopic(optN));
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	848 exit(0);
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	849 }
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	850 else
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	851 {
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	852 int ncolors;
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	853 if (!dmParseMapOptionString(optArg, optColorMap,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	854 &ncolors, D64_NCOLORS, FALSE, "color index option"))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	855 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	856
2030 2b961e6b35e5 Update documentation etc. Matti Hamalainen <ccr@tnsp.org> parents: 2029 diff changeset	857 dmMsg(1, "Set color index mapping: ");
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	858 for (int 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	859 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	860 dmPrint(1, "[%d:%d]%s",
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	861 index, optColorMap[index],
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	862 (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	863 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 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	865 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	868 case 24:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	869 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	870 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	871 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	872 dmErrorMsg("Invalid count value argument '%s' [1 .. MAXINT]\n",
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	873 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	874 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	875 }
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	876 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	877 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	878
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	879 case 26:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	880 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	881 tmpUInt < 1 \|\| tmpUInt > 512)
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	882 {
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	883 dmErrorMsg("Invalid planed width value '%s' [1 .. 512]\n",
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	884 optArg);
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	885 return FALSE;
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	886 }
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	887 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	888 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	890 case 28:
2495 88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	891 if (strcasecmp(optArg, "help") == 0)
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	892 {
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	893 fprintf(stdout, "\n%s\n", argGetHelpTopic(optN));
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	894 exit(0);
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	895 }
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	896 else
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	898 BOOL error = FALSE;
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	899 unsigned int tmpUInt2;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	900 char *tmpStr = dm_strdup(optArg),
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	901 *tmpOpt = tmpStr, sep;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	902
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	903 // 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	904 if (tmpOpt == '')
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	905 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	906 tmpOpt++;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	907 optScaleMode = SCALE_RELATIVE;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	908 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	909 else
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	910 optScaleMode = SCALE_SET;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	911
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	912 // Parse the values
2485 fce2ed3f681f Change dmParseIntValWithSep() separator spec from char to char , to specify Matti Hamalainen <ccr@tnsp.org>* parents: 2484 diff changeset	913 if (dmParseIntValWithSep(&tmpOpt, &tmpUInt, &sep, ":"))
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	914 {
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	915 if (sep == ':' &&
2485 fce2ed3f681f Change dmParseIntValWithSep() separator spec from char to char , to specify Matti Hamalainen <ccr@tnsp.org>* parents: 2484 diff changeset	916 dmParseIntValWithSep(&tmpOpt, &tmpUInt2, &sep, "*"))
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	917 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	918 optSpec.scaleX = tmpUInt;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	919 optSpec.scaleY = tmpUInt2;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	920
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	921 if (sep == '*' &&
2496 6a6ed3eeded5 Fix parsing of some arguments to -S option. Matti Hamalainen <ccr@tnsp.org> parents: 2495 diff changeset	922 dmParseIntValWithSep(&tmpOpt, &tmpUInt, &sep, ""))
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	923 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	924 optSpec.scaleX *= tmpUInt;
ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	925 optSpec.scaleY *= tmpUInt;
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	926 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	927 error = (sep != 0);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	928 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	929 else
1890 ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	930 if (sep == 0)
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	931 {
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	932 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	933 }
ee95059b4c18 Oops, fix a blunder left in the refactored scale option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1889 diff changeset	934 else
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	935 error = TRUE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	936 }
902 c6c480e8e1c8 Add separate X and Y scaling to gfxconv and libgfx outputters. Matti Hamalainen <ccr@tnsp.org> parents: 897 diff changeset	937 else
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	938 error = TRUE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	939
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	940 dmFree(tmpStr);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	941
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	942 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	943 {
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	944 dmErrorMsg(
2496 6a6ed3eeded5 Fix parsing of some arguments to -S option. Matti Hamalainen <ccr@tnsp.org> parents: 2495 diff changeset	945 "Invalid scale option value '%s', should be []<n> or or <w>:<h>[<n>].\n",
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	946 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	947 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	948 }
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	949
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	950 if (optSpec.scaleX < 1 \|\| optSpec.scaleX > 50)
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	951 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	952 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	953 return FALSE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	954 }
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	955 if (optSpec.scaleY < 1 \|\| optSpec.scaleY > 50)
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	956 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	957 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	958 return FALSE;
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	959 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	962
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	963 case 30:
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	964 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	965 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	966
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	967 case 32:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	968 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	969 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	970 {
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	971 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	972 optArg);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	973 return FALSE;
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	974 }
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	975 optSpec.nplanes = tmpUInt;
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	976 break;
6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	977
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	978 case 34:
2004 161e731eb152 Improve dmGetIntVal() to accept an optional negative value boolean flag Matti Hamalainen <ccr@tnsp.org> parents: 1947 diff changeset	979 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
1889 ac9784afae27 Improve option argument parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1888 diff changeset	980 tmpUInt < 1 \|\| tmpUInt > 32)
1288 6c8b19d1d196 More work on libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 1280 diff changeset	981 {
2144 0bb1d0ad178f Fix bpp option description. Matti Hamalainen <ccr@tnsp.org> parents: 2143 diff changeset	982 dmErrorMsg("Invalid number of bits per plane value '%s' [1 .. 32]\n",
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	983 optArg);
b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	984 return FALSE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	985 }
2099 dac89484f143 Fix nplanes and bpp in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2097 diff changeset	986 optSpec.bpp = tmpUInt;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	987 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	988
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	989 case 36:
1291 2c4acbc3e7bf More work on libgfx etc. Matti Hamalainen <ccr@tnsp.org> parents: 1290 diff changeset	990 optSpec.planar = TRUE;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	991 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	992
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	993 case 38:
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	994 if (!dmGetIntVal(optArg, &tmpUInt, NULL) \|\|
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	995 tmpUInt > FCMP_BEST)
1888 b97f273a9d54 Improve some gfxconv commanline option parsing. Matti Hamalainen <ccr@tnsp.org> parents: 1886 diff changeset	996 {
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	997 dmErrorMsg("Invalid compression setting '%s' [%d .. %d]\n",
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	998 optArg, FCMP_NONE, FCMP_BEST);
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	999 return FALSE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1000 }
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1001 optSpec.compression = tmpUInt;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1002 break;
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1003
2413 902cc22018a1 Option index adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	1004 case 40:
2488 87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1005 if (strcasecmp(optArg, "auto") == 0)
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	1006 {
2488 87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1007 optCropMode = CROP_AUTO;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1008 }
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1009 else
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1010 {
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1011 unsigned int tx0, ty0, tx1, ty1;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1012 char sep, modeSep = 0, tmpTok, tmpStr;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1013 BOOL ok;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1014 if ((tmpTok = tmpStr = dm_strdup(optArg)) == NULL)
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	1015 {
2488 87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1016 dmErrorMsg("Could not allocate memory for temporary string.\n");
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1017 return FALSE;
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	1018 }
2488 87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1019
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1020 // Check for 'x0:y0-x1:y1' pattern
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1021 ok = dmParseIntValWithSep(&tmpTok, &tx0, &sep, ":") &&
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1022 sep == ':' &&
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1023 dmParseIntValWithSep(&tmpTok, &ty0, &modeSep, ":-") &&
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1024 (sep == ':' \|\| sep == '-') &&
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1025 dmParseIntValWithSep(&tmpTok, &tx1, &sep, ":") &&
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1026 sep == ':' &&
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1027 dmParseIntValWithSep(&tmpTok, &ty1, &sep, "");
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1028
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1029 dmFree(tmpStr);
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1030
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1031 if (ok)
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	1032 {
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	1033 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	1034 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	1035 optCropY0 = ty0;
2488 87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1036
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1037 if (modeSep == '-')
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1038 {
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1039 DM_SWAP_IF(unsigned int, tx0, tx1);
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1040 DM_SWAP_IF(unsigned int, ty0, ty1);
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1041
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1042 optCropW = tx1 - tx0;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1043 optCropH = ty1 - ty0;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1044
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1045 dmMsg(1, "Crop coordinates %d, %d - %d, %d [dim %d, %d]\n",
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1046 tx0, ty0, tx1, ty1, optCropW, optCropH);
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1047 }
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1048 else
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1049 {
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1050 optCropW = tx1;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1051 optCropH = ty1;
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1052
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1053 dmMsg(1, "Crop coordinates %d, %d - %d, %d [dim %d, %d]\n",
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1054 tx0, ty0, tx0 + tx1, ty0 + ty1, optCropW, optCropH);
87c8be2bc8ba Rework some option parsing to be more robust. Matti Hamalainen <ccr@tnsp.org> parents: 2487 diff changeset	1055 }
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	1056 }
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	1057 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	1058 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1059 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	1060 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	1061 }
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	1062 }
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	1063 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	1064
2413 902cc22018a1 Option index adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	1065 case 42:
2495 88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	1066 if (strcasecmp(optArg, "help") == 0)
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	1067 {
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	1068 fprintf(stdout, "\n%s\n", argGetHelpTopic(optN));
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	1069 exit(0);
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	1070 }
88c68a03c493 Add 'help' support to -m, -S and -R options. Matti Hamalainen <ccr@tnsp.org> parents: 2494 diff changeset	1071
2492 1bd7387984ed Add few comments to the -R sub-option parsing and remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 2491 diff changeset	1072 // Check if any flags/sub-options are specified
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1073 if ((tmpStr = strchr(optArg, '+')) != NULL)
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1074 {
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1075 *tmpStr++ = 0;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1076 do
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1077 {
2492 1bd7387984ed Add few comments to the -R sub-option parsing and remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 2491 diff changeset	1078 // Parse one sub-option
1bd7387984ed Add few comments to the -R sub-option parsing and remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 2491 diff changeset	1079 char sep, *topt = dmParseValWithSep(&tmpStr, &sep, NULL, "+");
1bd7387984ed Add few comments to the -R sub-option parsing and remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 2491 diff changeset	1080
1bd7387984ed Add few comments to the -R sub-option parsing and remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 2491 diff changeset	1081 // Check what option we have
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1082 if (strcasecmp(topt, "remove") == 0)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1083 optRemapRemove = TRUE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1084 else
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1085 if (strcasecmp(topt, "alpha") == 0)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1086 optRemapMatchAlpha = TRUE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1087 else
2494 fcaf2db0cd05 Remove dm_str(n)casecmp() functions, in favour of standard libc ones. Matti Hamalainen <ccr@tnsp.org> parents: 2493 diff changeset	1088 if (strncasecmp(topt, "max=", 4) == 0)
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1089 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1090 char start = topt + 4, end;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1091 optRemapMaxDist = strtof(start, &end);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1092
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1093 if (end == start)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1094 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1095 dmErrorMsg("Invalid or missing value parameter for -R option flag: '%s'.\n",
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1096 topt);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1097 return FALSE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1098 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1099 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1100 else
2494 fcaf2db0cd05 Remove dm_str(n)casecmp() functions, in favour of standard libc ones. Matti Hamalainen <ccr@tnsp.org> parents: 2493 diff changeset	1101 if (strncasecmp(topt, "nomatch=", 8) == 0)
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1102 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1103 char start = topt + 8, end;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1104 optRemapNoMatchColor = strtol(start, &end, 10);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1105
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1106 if (end == start)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1107 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1108 dmErrorMsg("Invalid or missing value parameter for -R option flag: '%s'.\n",
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1109 topt);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1110 return FALSE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1111 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1112
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1113 if (optRemapNoMatchColor < -1 \|\| optRemapNoMatchColor > 255)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1114 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1115 dmErrorMsg("Invalid remap no-match color value %d. Should be [-1 .. 255].\n",
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1116 optRemapNoMatchColor);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1117 return FALSE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1118 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1119 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1120 else
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1121 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1122 dmErrorMsg("Unknown -R option flag '%s'.\n", topt);
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1123 return FALSE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1124 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1125 } while (*tmpStr != 0);
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1126 }
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1127
2492 1bd7387984ed Add few comments to the -R sub-option parsing and remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 2491 diff changeset	1128 // Check which remap mode is being requested
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1129 if (strcasecmp(optArg, "auto") == 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	1130 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1131 if (optRemapMode != REMAP_NONE && optRemapMode != REMAP_AUTO)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1132 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1133 dmErrorMsg("Remap mode already set to something else than 'auto'. You can only have one remapping mode.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1134 return FALSE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1135 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1136
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1137 optRemapMode = REMAP_AUTO;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1138 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1139 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1140 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1141 if (optRemapMode != REMAP_NONE && optRemapMode != REMAP_MAPPED)
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1142 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1143 dmErrorMsg("Remap mode already set to something else than 'mapped'. You can only have one remapping mode.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1144 return FALSE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1145 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1146
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1147 if (optArg[0] == '@')
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1148 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1149 if (optArg[1] != 0)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1150 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1151 int res;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1152 if ((res = dmParseColorRemapFile(optArg + 1,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1153 optRemapTable, &optNRemapTable, DM_MAX_COLORS)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1154 return FALSE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1155 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1156 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1157 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1158 dmErrorMsg("No remap filename given.\n");
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1159 return FALSE;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1160 }
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1161 }
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1162 else
60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1163 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1164 if (!dmParseMapOptionString(optArg, optRemapTable,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1165 &optNRemapTable, DM_MAX_COLORS, TRUE, "color remap option"))
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1166 return FALSE;
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1167 }
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1168
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1169 optRemapMode = REMAP_MAPPED;
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	1170 }
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1171
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1172 if (optRemapMatchAlpha)
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1173 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1174 dmErrorMsg("WARNING: Palette alpha matching may have unexpected results.\n");
2408 60e119262c67 Option index re-ordering cleanup work. Matti Hamalainen <ccr@tnsp.org> parents: 2402 diff changeset	1175 }
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	1176 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	1177
2413 902cc22018a1 Option index adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	1178 case 44:
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	1179 optCharROMFilename = optArg;
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	1180 break;
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	1181
2413 902cc22018a1 Option index adjustments. Matti Hamalainen <ccr@tnsp.org> parents: 2410 diff changeset	1182 case 46:
2214 f8bba7a82ec2 Rename variable. Matti Hamalainen <ccr@tnsp.org> parents: 2208 diff changeset	1183 return argHandleC64PaletteOption(optArg, &optC64Palette, &optPaletteFile);
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	1184
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1185 default:
2183 e3f0eaf23f4f Change the error message for unimplemented option argument. Matti Hamalainen <ccr@tnsp.org> parents: 2182 diff changeset	1186 dmErrorMsg("Unimplemented option argument '%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	1187 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	1188 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1189
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1190 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	1191 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1192
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1193
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1194 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	1195 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1196 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	1197 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	1198 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1199 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	1200 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	1201 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1202 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	1203 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1204
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1205 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	1206 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1207
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1208
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1209 void dmPrintByte(FILE *out, const Uint8 byte, const int format, const BOOL multicolor, const BOOL dir)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1210 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211 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	1212 {
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1213 for (int i = 0; i < DM_ASC_NBITS; 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	1214 {
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1215 int k = dir ? i : (DM_ASC_NBITS - i - 1);
de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1216 Uint8 val = (byte & (3ULL << k)) >> k;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1217 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	1218 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	1219 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1220 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	1221 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	1222 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	1223 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1224 case FFMT_ANSI:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1225 fprintf(out, "\x1b[%sm##\x1b[0m",
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1226 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	1227 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1228 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1229 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1230 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1231 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1232 {
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1233 for (int i = 0; i < DM_ASC_NBITS; 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	1234 {
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1235 int k = dir ? i : (DM_ASC_NBITS - i - 1);
de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1236 Uint8 val = (byte & (1ULL << k)) >> k;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237 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	1238 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1239 case FFMT_ASCII:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1240 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	1241 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1242 case FFMT_ANSI:
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1243 fprintf(out, "\x1b[%sm#\x1b[0m",
3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	1244 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	1245 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1246 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1247 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1249 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1250
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1251
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1252 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	1253 {
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	1254 for (size_t yc = 0; yc < D64_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	1255 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1256 fprintf(outFile, "%04" DM_PRIx_SIZE_T " : ", offs + yc);
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1257 dmPrintByte(outFile, buf[yc], fmt, multicolor, 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	1258 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	1259 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1260 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1261
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1263 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	1264 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1265 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	1266
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	1267 for (bufOffs = yc = 0; yc < D64_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	1268 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	1269 fprintf(outFile, "%04" DM_PRIx_SIZE_T " ", offs + bufOffs);
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	1270 for (xc = 0; xc < D64_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	1271 {
2359 de570106b6cc Add argument to dmPrintByte() for reversing the bits. Matti Hamalainen <ccr@tnsp.org> parents: 2295 diff changeset	1272 dmPrintByte(outFile, buf[bufOffs], fmt, multicolor, 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	1273 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	1274 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1275 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1276 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	1277 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1278 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1279
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1280
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1281 // XXX TODO: we need to evaluate the color vector itself, not just the distance
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1282 float dmGetColorDist(const DMColor c1, const DMColor c2, const BOOL alpha)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1283 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1284 const float
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1285 dr = (c1->r - c2->r) / 255.0,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1286 dg = (c1->g - c2->g) / 255.0,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1287 db = (c1->b - c2->b) / 255.0;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1288
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1289 if (alpha)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1290 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1291 const float da = (c1->a - c2->a) / 255.0;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1292 return (dr * dr + dg * dg + db * db + da * da) / 4.0;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1293 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1294 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1295 return (dr * dr + dg * dg + db * db) / 3.0;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1296 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1297
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1298
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1299 int dmScanUsedColors(const DMImage src, const BOOL warn, BOOL used, int *nused)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1300 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1301 BOOL warned = FALSE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1302 *nused = 0;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1303
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1304 if (src == NULL \|\| used == NULL \|\| nused == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1305 return DMERR_NULLPTR;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1306
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1307 if (src->pal == NULL \|\| src->pixfmt != DM_PIXFMT_PALETTE)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1308 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1309 return dmError(DMERR_INVALID_DATA,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1310 "Source image is not paletted.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1311 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1312
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1313 for (int index = 0; index < src->pal->ncolors; index++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1314 used[index] = FALSE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1315
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1316 for (int yc = 0; yc < src->height; yc++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1317 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1318 const Uint8 dp = src->data + src->pitch yc;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1319 for (int xc = 0; xc < src->width; xc++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1320 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1321 Uint8 col = dp[xc];
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1322 if (col < src->pal->ncolors)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1323 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1324 if (!used[col])
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1325 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1326 used[col] = TRUE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1327 (*nused)++;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1328 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1329 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1330 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1331 if (warn && !warned)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1332 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1333 dmErrorMsg("Image contains color indices that are out of bounds of the palette.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1334 warned = TRUE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1335 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1336 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1337 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1338
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1339 return DMERR_OK;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1340 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1341
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1342
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1343 int dmDoRemapImageColors(DMImage *pdst, const DMImage src,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1344 const int mapping, const DMPalette dpal)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1345 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1346 DMImage *dst = NULL;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1347 int res = DMERR_OK;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1348
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1349 if (pdst == NULL \|\| src == NULL \|\| mapping == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1350 return DMERR_NULLPTR;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1351
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1352 // Allocate target image
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1353 if ((dst = *pdst = dmImageAlloc(src->width, src->height,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1354 src->pixfmt, -1)) == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1355 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1356 res = dmError(DMERR_MALLOC,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1357 "Could not allocate image for re-mapped data.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1358 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1359 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1360
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1361 for (int yc = 0; yc < src->height; yc++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1362 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1363 Uint8 sp = src->data + src->pitch yc;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1364 Uint8 dp = dst->data + dst->pitch yc;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1365 for (int xc = 0; xc < src->width; xc++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1366 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1367 dp[xc] = mapping[sp[xc]];
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1368 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1369 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1370
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1371 if ((res = dmPaletteCopy(&dst->pal, dpal)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1372 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1373 dmErrorMsg("Error installing remapped palette to destination image: %s\n",
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1374 dmErrorStr(res));
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1375 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1376 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1377
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1378 out:
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1379 return res;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1380 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1381
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1382
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1383 int dmRemapImageColors(DMImage *pdst, const DMImage src,
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1384 const DMPalette *dpal,
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1385 const float maxDist, const int noMatchColor,
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1386 const BOOL alpha, const BOOL removeUnused)
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1387 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1388 DMPalette *tpal = NULL;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1389 const DMPalette *ppal;
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1390 BOOL *used = NULL;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1391 int mapping = NULL, mapped = NULL;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1392 int res = DMERR_OK;
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1393 BOOL fail = FALSE;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1394
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1395 if (pdst == NULL \|\| src == NULL \|\| dpal == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1396 return DMERR_NULLPTR;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1397
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1398 if (src->pal == NULL \|\| src->pixfmt != DM_PIXFMT_PALETTE)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1399 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1400 res = dmError(DMERR_INVALID_DATA,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1401 "Source image is not paletted.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1402 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1403 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1404
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1405 dmMsg(1, "Remapping image from %d to %d colors @ maxDist=",
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1406 src->pal->ncolors,
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1407 dpal->ncolors);
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1408
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1409 if (maxDist < 0)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1410 dmPrint(1, "auto");
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1411 else
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1412 dmPrint(1, "%1.3f", maxDist);
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1413
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1414 dmPrint(1, ", %s, ",
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1415 alpha ? "match alpha" : "ignore alpha");
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1416
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1417 if (noMatchColor < 0)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1418 dmPrint(1, "fail on 'no match'\n");
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1419 else
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1420 dmPrint(1, "use color #%d if no match\n", noMatchColor);
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1421
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1422 // Allocate remapping tables
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1423 if ((mapped = dmMalloc0(src->pal->ncolors * sizeof(*mapped))) == NULL \|\|
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1424 (used = dmMalloc0(src->pal->ncolors * sizeof(*used))) == NULL \|\|
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1425 (mapping = dmMalloc(src->pal->ncolors * sizeof(*mapping))) == NULL)
2449 ff639208aae6 Reorder few NULL checks to be earlier. Matti Hamalainen <ccr@tnsp.org> parents: 2448 diff changeset	1426 {
ff639208aae6 Reorder few NULL checks to be earlier. Matti Hamalainen <ccr@tnsp.org> parents: 2448 diff changeset	1427 res = dmError(DMERR_MALLOC,
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1428 "Could not allocate memory for color remap tables.\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	1429 goto out;
2449 ff639208aae6 Reorder few NULL checks to be earlier. Matti Hamalainen <ccr@tnsp.org> parents: 2448 diff changeset	1430 }
ff639208aae6 Reorder few NULL checks to be earlier. Matti Hamalainen <ccr@tnsp.org> parents: 2448 diff changeset	1431
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1432 for (int index = 0; index < src->pal->ncolors; index++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1433 mapping[index] = -1;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1434
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1435 // Populate remap table
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1436 for (int sc = 0; sc < src->pal->ncolors; sc++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1437 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1438 // Check if we can find a match in destination palette dpal
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1439 float closestDist = 1000000, dist = 0;
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1440 int closestDC = -1;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1441
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1442 for (int dc = 0; dc < dpal->ncolors; dc++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1443 {
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1444 dist = dmGetColorDist(&src->pal->colors[sc], &dpal->colors[dc], alpha);
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1445 if (dist < closestDist)
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1446 {
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1447 closestDist = dist;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1448 closestDC = dc;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1449 }
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1450 }
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1451
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1452 // Did we find a close-enough match?
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1453 if (maxDist >= 0 && closestDist > maxDist)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1454 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1455 // No, either error out or use noMatchColor color index
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1456 if (noMatchColor < 0)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1457 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1458 DMColor *dcol = &dpal->colors[closestDC];
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1459
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1460 dmPrint(0,
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1461 "No match for source color #%d. Closest: #%d (%02x %02x %02x) [dist=%1.3f > %1.3f]\n",
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1462 sc, closestDC, dcol->r, dcol->g, dcol->b,
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1463 closestDist, maxDist);
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1464 fail = TRUE;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1465 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1466 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1467 {
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1468 closestDC = noMatchColor;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1469 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1470 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1471 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1472 {
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1473 DMColor *scol = &src->pal->colors[sc],
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1474 *dcol = &dpal->colors[closestDC];
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1475
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1476 dmPrint(3, "Palette match #%d (%02x %02x %02x) -> #%d (%02x %02x %02x) [dist=%1.3f]\n",
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1477 sc, scol->r, scol->g, scol->b,
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1478 closestDC, dcol->r, dcol->g, dcol->b,
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1479 closestDist);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1480 }
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1481
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1482 mapping[sc] = closestDC;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1483 }
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1484
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1485 if (fail)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1486 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1487 res = DMERR_INVALID_DATA;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1488 goto out;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1489 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1490
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1491 // Remove unused colors if requested
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1492 if (removeUnused)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1493 {
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1494 int nused;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1495
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1496 if (noMatchColor >= 0)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1497 {
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1498 dmErrorMsg("WARNING! Removing unused colors with 'no-match' color index set may have unintended results.\n");
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1499 }
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1500
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1501 // Get the actually used colors
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1502 if ((res = dmScanUsedColors(src, TRUE, used, &nused)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1503 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1504
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1505 dmMsg(2, "Found %d used color indices.\n", nused);
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1506
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1507 // Remove duplicates from the mapped colour indices
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1508 for (int index = 0; index < src->pal->ncolors; index++)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1509 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1510 for (int n = 0; n < src->pal->ncolors; n++)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1511 if (n != index &&
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1512 mapping[index] == mapping[n] &&
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1513 used[n] && used[index])
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1514 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1515 used[n] = FALSE;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1516 }
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1517 }
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1518
2491 ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1519 if (noMatchColor >= 0)
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1520 used[noMatchColor] = TRUE;
ed2f56abda22 Implement parsing of -R option suboptions. Matti Hamalainen <ccr@tnsp.org> parents: 2488 diff changeset	1521
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1522 // Re-count number of actually used indices
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1523 nused = 0;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1524 for (int index = 0; index < src->pal->ncolors; index++)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1525 if (used[index])
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1526 nused++;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1527
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1528 dmMsg(2, "After mapped dupe removal, %d color indices used.\n", nused);
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1529
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1530 if ((res = dmPaletteAlloc(&tpal, nused, -1)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1531 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1532 dmErrorMsg("Could not allocate memory for remap palette.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1533 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1534 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1535
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1536 // Copy colors from dpal to tpal, also mapping the reordered indices
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1537 nused = 0;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1538 for (int index = 0; index < src->pal->ncolors; index++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1539 if (used[index])
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1540 {
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1541 // Copy the color to tpal
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1542 memcpy(&tpal->colors[nused], &dpal->colors[mapping[index]], sizeof(DMColor));
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1543
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1544 // Save current mapping to mapped[]
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1545 mapped[nused] = mapping[index];
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1546
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1547 // Reorder the mapping
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1548 mapping[index] = nused;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1549 nused++;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1550 }
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1551 else
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1552 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1553 // "Unused" color, find matching mapping from mapped[]
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1554 for (int n = 0; n < nused; n++)
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1555 if (mapping[index] == mapped[n])
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1556 {
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1557 mapping[index] = n;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1558 break;
14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	1559 }
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1560 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1561
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1562 ppal = tpal;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1563 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1564 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1565 ppal = dpal;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1566
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1567 // Perform image data remapping
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1568 res = dmDoRemapImageColors(pdst, src, mapping, ppal);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1569
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1570 out:
2484 79e3f824a2d0 Oops, use dmPaletteFree() instead of dmFree(). Matti Hamalainen <ccr@tnsp.org> parents: 2483 diff changeset	1571 dmPaletteFree(tpal);
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1572 dmFree(mapping);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1573 dmFree(mapped);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1574 dmFree(used);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1575 return res;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1576 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1577
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1578
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1579 int dmMapImageColors(DMImage *pdst, const DMImage src,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1580 const DMMapValue *mapTable, const int nmapTable,
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1581 const float maxDist, const int noMatchColor,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1582 const BOOL alpha, const BOOL removeUnused)
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1583 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1584 DMPalette *tpal = NULL;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1585 BOOL mapped = NULL, used = NULL;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1586 int *mapping = NULL;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1587 int nused, res = DMERR_OK;
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1588 BOOL fail = FALSE;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1589
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1590 if (pdst == NULL \|\| src == NULL \|\| mapTable == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1591 return DMERR_NULLPTR;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1592
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1593 if (src->pal == NULL \|\| src->pixfmt != DM_PIXFMT_PALETTE)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1594 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1595 res = dmError(DMERR_INVALID_DATA,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1596 "Source image is not paletted.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1597 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1598 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1599
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1600 // Allocate remapping tables
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1601 if ((mapped = dmMalloc(src->pal->ncolors * sizeof(*mapped))) == NULL \|\|
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1602 (used = dmMalloc(src->pal->ncolors * sizeof(*used))) == NULL \|\|
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1603 (mapping = dmMalloc(src->pal->ncolors * sizeof(*mapping))) == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1604 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1605 res = dmError(DMERR_MALLOC,
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1606 "Could not allocate memory for color remap tables.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1607 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1608 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1609
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1610 for (int index = 0; index < src->pal->ncolors; index++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1611 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1612 mapping[index] = -1;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1613 mapped[index] = FALSE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1614 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1615
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1616 if ((res = dmPaletteAlloc(&tpal, src->pal->ncolors, -1)) != DMERR_OK)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	1617 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	1618 dmErrorMsg("Could not allocate memory for remap palette.\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	1619 goto out;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	1620 }
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	1621
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1622 dmMsg(1, "Remapping %d input image of %d colors, %s, ",
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1623 optNRemapTable, src->pal->ncolors,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1624 alpha ? "match alpha" : "ignore alpha");
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1625
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1626 if (noMatchColor < 0)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1627 dmPrint(1, "fail on 'no match'\n");
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1628 else
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1629 dmPrint(1, "use color #%d if no match\n", noMatchColor);
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	1630
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	1631 // Match and mark mapped colors
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1632 for (int index = 0; index < nmapTable; index++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1633 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1634 const DMMapValue *map = &mapTable[index];
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1635 if (map->triplet)
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1636 {
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1637 float closestDist = 1000000, dist = 0;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1638 int closestDC = -1;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1639
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1640 for (int n = 0; n < src->pal->ncolors; n++)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1641 {
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1642 dist = dmGetColorDist(&src->pal->colors[n], &map->color, map->alpha && alpha);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1643 if (dist < closestDist)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1644 {
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1645 closestDist = dist;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1646 closestDC = n;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1647 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1648 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1649
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1650 // Did we find a close-enough match?
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1651 if (maxDist >= 0 && closestDist > maxDist)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1652 {
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1653 // No, either error out or use noMatchColor color index
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1654 if (noMatchColor < 0)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1655 {
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1656 DMColor *dcol = &src->pal->colors[closestDC];
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1657
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1658 dmMsg(3, "No RGBA match found for map index %d, #%02x%02x%02x%02x. Closest: #%d (#%02x%02x%02x%02x) [dist=%1.3f > %1.3f]\n",
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1659 index, map->color.r, map->color.g, map->color.b, map->color.a,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1660 closestDC, dcol->r, dcol->g, dcol->b, dcol->a, closestDist, maxDist);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1661
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1662 fail = TRUE;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1663 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1664 else
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1665 {
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1666 DMColor *dcol = &src->pal->colors[noMatchColor];
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1667 closestDC = noMatchColor;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1668
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1669 dmMsg(3, "RGBA noMatch #%02x%02x%02x%02x: #%d -> #%d #%02x%02x%02x%02x [dist=%1.3f]\n",
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1670 map->color.r, map->color.g, map->color.b, map->color.a,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1671 map->to,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1672 closestDC, dcol->r, dcol->g, dcol->b, dcol->a, closestDist);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1673
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1674 mapping[closestDC] = map->to;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1675 mapped[map->to] = TRUE;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1676 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1677 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1678 else
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1679 {
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1680 DMColor *dcol = &src->pal->colors[closestDC];
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1681
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1682 dmMsg(3, "RGBA match #%02x%02x%02x%02x: #%d -> #%d #%02x%02x%02x%02x [dist=%1.3f]\n",
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1683 map->color.r, map->color.g, map->color.b, map->color.a,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1684 map->to,
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1685 closestDC, dcol->r, dcol->g, dcol->b, dcol->a, closestDist);
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1686
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1687 mapping[closestDC] = map->to;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1688 mapped[map->to] = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1689 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1690 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1691 else
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1692 {
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1693 dmMsg(3, "Map index: %d -> %d\n",
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1694 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	1695
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1696 mapping[map->from] = map->to;
6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1697 mapped[map->to] = TRUE;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1698 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1699 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1700
2493 ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1701 if (fail)
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1702 {
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1703 res = DMERR_INVALID_DATA;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1704 goto out;
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1705 }
ec036e88a0c2 More improvements to palette remapping etc. Matti Hamalainen <ccr@tnsp.org> parents: 2492 diff changeset	1706
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1707 // Fill the unmapped colors
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1708 if (removeUnused)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1709 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1710 dmMsg(2, "Scanning for used colors.\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1711
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1712 if ((res = dmScanUsedColors(src, TRUE, used, &nused)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1713 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1714
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1715 dmMsg(2, "Removing unused colors: %d -> %d.\n",
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1716 src->pal->ncolors, nused);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1717 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1718
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1719 for (int index = 0; index < src->pal->ncolors; index++)
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1720 if (mapping[index] < 0 &&
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1721 (!removeUnused \|\| used[index]))
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1722 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1723 for (int n = 0; n < src->pal->ncolors; n++)
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1724 if (!mapped[n])
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1725 {
1807 d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1726 mapping[index] = n;
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1727 mapped[n] = TRUE;
d53bdee5ffa5 Remove slight bit of code duplication. Matti Hamalainen <ccr@tnsp.org> parents: 1801 diff changeset	1728 break;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1729 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1730 }
482 6fdee3ec2894 Improve remapping. Matti Hamalainen <ccr@tnsp.org> parents: 481 diff changeset	1731
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1732 // Copy mapped palette entries
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1733 for (int index = 0; index < src->pal->ncolors; index++)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1734 if (mapping[index] >= 0)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1735 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1736 memcpy(&tpal->colors[mapping[index]], &src->pal->colors[index], sizeof(DMColor));
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1737 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1738
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1739 // Perform image data remapping
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1740 res = dmDoRemapImageColors(pdst, src, mapping, tpal);
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	1741
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	1742 out:
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1743 dmPaletteFree(tpal);
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	1744 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	1745 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	1746 dmFree(used);
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	1747 return res;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1748 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1749
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	1750
2226 6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1751 int dmDumpC64Block(const char fprefix, const char fext, const DMC64MemBlock *blk, const int index)
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1752 {
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1753 int res = DMERR_OK;
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1754 if (blk != NULL && blk->data != NULL)
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1755 {
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1756 char *filename = dm_strdup_printf("%s_%s_%d.bin", fprefix, fext, index);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1757 if (filename == NULL)
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1758 return DMERR_MALLOC;
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1759
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1760 res = dmWriteDataFile(NULL, filename, blk->data, blk->size);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1761 dmFree(filename);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1762 }
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1763 return res;
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1764 }
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1765
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1766
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1767 int dmDumpC64Bitmap(const char fprefix, const DMC64Image img)
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1768 {
2230 ba5141771d9a Initialize variable. Matti Hamalainen <ccr@tnsp.org> parents: 2226 diff changeset	1769 int res = DMERR_OK;
2226 6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1770
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1771 for (int i = 0; i < img->nblocks; i++)
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1772 {
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1773 res = dmDumpC64Block(fprefix, "bitmap", &img->bitmap[i], i);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1774 res = dmDumpC64Block(fprefix, "color", &img->color[i], i);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1775 res = dmDumpC64Block(fprefix, "screen", &img->screen[i], i);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1776 res = dmDumpC64Block(fprefix, "extradata", &img->extraData[i], i);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1777 }
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1778
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1779 return res;
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1780 }
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1781
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	1782
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1783 int dmConvertC64Bitmap(DMC64Image *pdst, const DMC64Image src,
ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1784 const DMC64ImageFormat dstFmt, const DMC64ImageFormat srcFmt)
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1785 {
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1786 DMC64Image *dst;
1891 91b80990043c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1890 diff changeset	1787 DMC64MemBlock srcBlk = NULL, dstBlk = NULL;
91b80990043c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1890 diff changeset	1788 const char *blkname = NULL;
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1789
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1790 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	1791 return DMERR_NULLPTR;
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1792
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	1793 // Allocate the destination image
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1794 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	1795 return DMERR_MALLOC;
d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1796
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	1797 // 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	1798 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	1799 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	1800 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	1801 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	1802 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	1803
2369 2dfb448a7ff5 Copy certain DMC64Image::extraInfo fields in dmConvertC64Bitmap() to the destination image. Matti Hamalainen <ccr@tnsp.org> parents: 2360 diff changeset	1804 // And some extraInfo fields ..
2dfb448a7ff5 Copy certain DMC64Image::extraInfo fields in dmConvertC64Bitmap() to the destination image. Matti Hamalainen <ccr@tnsp.org> parents: 2360 diff changeset	1805 dst->extraInfo[D64_EI_CHAR_CASE] = src->extraInfo[D64_EI_CHAR_CASE];
2dfb448a7ff5 Copy certain DMC64Image::extraInfo fields in dmConvertC64Bitmap() to the destination image. Matti Hamalainen <ccr@tnsp.org> parents: 2360 diff changeset	1806 dst->extraInfo[D64_EI_CHAR_CUSTOM] = src->extraInfo[D64_EI_CHAR_CUSTOM];
2dfb448a7ff5 Copy certain DMC64Image::extraInfo fields in dmConvertC64Bitmap() to the destination image. Matti Hamalainen <ccr@tnsp.org> parents: 2360 diff changeset	1807
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1808 // Try to do some simple fixups
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1809 if ((dst->extraInfo[D64_EI_MODE] & D64_FMT_MODE_MASK) == D64_FMT_MC &&
48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1810 (src->extraInfo[D64_EI_MODE] & D64_FMT_MODE_MASK) == D64_FMT_HIRES)
2124 a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1811 {
a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1812 dmC64MemBlockCopy(&dst->screen[0], &src->screen[0]);
a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1813 }
a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1814 else
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1815 if ((dst->extraInfo[D64_EI_MODE] & D64_FMT_MODE_MASK) == D64_FMT_HIRES &&
48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1816 (src->extraInfo[D64_EI_MODE] & D64_FMT_MODE_MASK) == D64_FMT_MC)
2124 a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1817 {
a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1818 // XXX TODO: Handle FLI mc->hires differently?
a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1819 }
a17b37872d8e Simplistic conversion fixups. Matti Hamalainen <ccr@tnsp.org> parents: 2123 diff changeset	1820
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1821 if ((dst->extraInfo[D64_EI_MODE] & D64_FMT_FLI) &&
48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1822 (src->extraInfo[D64_EI_MODE] & 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	1823 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1824 dmMsg(1, "Upconverting multicolor to FLI.\n");
2237 26f1bae40fb6 s/nbanks/nblocks/g Matti Hamalainen <ccr@tnsp.org> parents: 2236 diff changeset	1825 for (int i = 0; i < dst->nblocks; i++)
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1826 {
1929 b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1827 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	1828 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	1829
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1830 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	1831 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	1832
b49814dd8469 Only copy memory blocks that do not already exist in destination. Matti Hamalainen <ccr@tnsp.org> parents: 1928 diff changeset	1833 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	1834 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	1835 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1836 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1837 else
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1838 if ((src->extraInfo[D64_EI_MODE] & D64_FMT_FLI) &&
48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	1839 (dst->extraInfo[D64_EI_MODE] & 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	1840 {
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1841 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	1842 }
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1843
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	1844 // Do per opcode copies
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1845 for (int opn = 0; opn < D64_MAX_ENCDEC_OPS; opn++)
1493 d987a4933e1c Some dabbling work on basic C64 bitmap conversion. Matti Hamalainen <ccr@tnsp.org> parents: 1490 diff changeset	1846 {
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1847 const DMC64EncDecOp *op = fmtGetEncDecOp(dstFmt, opn);
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	1848 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	1849
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1850 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	1851 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	1852
1933 c5a46cb4cce5 Change DMC64ImageFormat parameter of dmC64GetSubjectSize() and Matti Hamalainen <ccr@tnsp.org> parents: 1931 diff changeset	1853 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	1854 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	1855 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1856 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	1857 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	1858 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	1859 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	1860 case DO_SET_OP:
2108 5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2103 diff changeset	1861 srcBlk = (DMC64MemBlock *) dmC64GetOpMemBlock(src, op->subject, op->bank);
5f8f170f8774 Change dmC64GetOpMemBlock() function API. Matti Hamalainen <ccr@tnsp.org> parents: 2103 diff changeset	1862 dstBlk = (DMC64MemBlock *) dmC64GetOpMemBlock(dst, op->subject, op->bank);
1852 219417325036 Split dmC64GetOpMemBlockAndName() into dmC64GetOpMemBlock() and Matti Hamalainen <ccr@tnsp.org> parents: 1843 diff changeset	1863 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	1864
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1865 // 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	1866 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	1867 break;
5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1868
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	1869 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	1870 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1871 // The block exists in source and is of sufficient size, so copy it
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1872 dmMsg(3, "Copying whole block '%s' "
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1873 "op #%d, offs=%d ($%04x), bank=%d, size=%" DM_PRIu_SIZE_T " ($%04" DM_PRIx_SIZE_T ")\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1874 blkname, opn, 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	1875
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	1876 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	1877 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1878 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	1879 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	1880 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1881 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	1882 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	1883 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	1884 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	1885 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	1886 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	1887 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1888 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	1889 "Could not allocate '%s' block! "
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1890 "op #%d, offs=%d ($%04x), bank=%d, size=%" DM_PRIu_SIZE_T " ($%04" DM_PRIx_SIZE_T ")\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1891 blkname, opn, op->offs, op->offs, op->bank, size, size);
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	1892 }
1829 5639142e0b87 Change the order and logic of how we do upconversion fixups in dmConvertC64Bitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1823 diff changeset	1893 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	1894 {
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1895 dmMsg(3, "Creating whole block '%s' "
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1896 "op #%d, offs=%d ($%04x), bank=%d, size=%" DM_PRIu_SIZE_T " ($%04" DM_PRIx_SIZE_T ")\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1897 blkname, opn, op->offs, op->offs, op->bank, size, size);
1842 a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1898 }
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1899 else
a3fc0cab1a60 Improve C64 bitmap conversion messages. Matti Hamalainen <ccr@tnsp.org> parents: 1836 diff changeset	1900 {
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1901 dmMsg(3, "Creating block '%s' from partial data "
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1902 "op #%d, offs=%d ($%04x), bank=%d, size=%" DM_PRIu_SIZE_T " ($%04" DM_PRIx_SIZE_T ")\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1903 blkname, opn, op->offs, op->offs, op->bank, size, size);
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	1904 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1905 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	1906 {
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1907 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	1908 // 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	1909 // 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	1910 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	1911 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	1912 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	1913
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1914 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	1915 // 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	1916 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	1917
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1918 case DO_SET_OP:
2414 69a5af2eb1ea Remove useless dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 2413 diff changeset	1919 memset(dstBlk->data, op->offs, size);
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	1920 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	1921
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1922 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	1923 return dmError(DMERR_INTERNAL,
2389 647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1924 "Unhandled op type #%d in "
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1925 "op #%d, offs=%d ($%04x), bank=%d, size=%" DM_PRIu_SIZE_T " ($%04" DM_PRIx_SIZE_T ")\n",
647671a9a0b8 More printf() format specifier size_t -related fixes. Matti Hamalainen <ccr@tnsp.org> parents: 2387 diff changeset	1926 op->type, opn, op->offs, op->offs, op->bank, size, size);
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	1927 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1928 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	1929 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1930 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	1931 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1932 }
02f604264bc4 Improve C64 image format up/down conversion. Might actually work for some formats now. Matti Hamalainen <ccr@tnsp.org> parents: 1811 diff changeset	1933
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1934 return DMERR_OK;
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1935 }
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1936
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1937
665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	1938 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	1939 {
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1940 int res = DMERR_OK;
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1941 DMGrowBuf buf;
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1942
1694 e568535e1a96 Backed out changeset 9611ecd2c4fb Matti Hamalainen <ccr@tnsp.org> parents: 1692 diff changeset	1943 dmGrowBufInit(&buf);
e568535e1a96 Backed out changeset 9611ecd2c4fb Matti Hamalainen <ccr@tnsp.org> parents: 1692 diff changeset	1944
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1945 // Encode to target format
e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1946 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	1947 if ((res = dmC64EncodeBMP(&buf, image, fmt)) != DMERR_OK)
1585 a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1948 {
a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1949 dmErrorMsg("Error encoding bitmap data: %s\n", dmErrorStr(res));
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	1950 goto out;
1585 a076c9d9b321 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 1584 diff changeset	1951 }
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1952
1481 e967e8e3b8c3 Sanitize dmWriteBitmap(). Matti Hamalainen <ccr@tnsp.org> parents: 1480 diff changeset	1953 // 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	1954 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	1955 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	1956
1550 ba09aa661c72 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1546 diff changeset	1957 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	1958
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	1959 out:
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	1960 dmGrowBufFree(&buf);
550 12854cbd6fab Initial support for bitmap -> bitmap conversion in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 547 diff changeset	1961 return res;
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1962 }
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1963
fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	1964
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1965 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	1966 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	1967 const char prefix, const DMImage img,
2156 e6ec7fad9ce2 Rename DMImageConvSpec to DMImageWriteSpec to better reflec the struct's purpose. Matti Hamalainen <ccr@tnsp.org> parents: 2155 diff changeset	1968 const DMImageWriteSpec *spec)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1969 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1970 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	1971 int res;
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1972
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1973 if ((res = dmf_open_stdio(hdrFilename, "wb", &fp)) != DMERR_OK)
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1974 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1975 return dmError(res,
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1976 "Could not open file '%s' for writing: %s\n",
2460 2723cf62d039 Improve few error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2459 diff changeset	1977 hdrFilename, dmErrorStr(res));
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1978 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1979
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	1980 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	1981
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	1982 dmf_close(fp);
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1983 return res;
1303 be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1984 }
be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1985
be30466fbc47 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1293 diff changeset	1986
2447 b0f25a42fd23 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2442 diff changeset	1987 int dmWriteImage(const char filename, DMImage pimage,
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	1988 DMImageWriteSpec spec, const DMImageFormat fmt)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1989 {
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	1990 int res = DMERR_OK;
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1991 DMImage *image = pimage;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	1992 BOOL allocated = 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	1993
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1994 // 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	1995 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	1996 {
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1997 return dmError(DMERR_NOT_SUPPORTED,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	1998 "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	1999 fmt->name);
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2000 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2001
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2002 dmMsg(1, "Outputting '%s' image %d x %d -> %d x %d [%d x %d]\n",
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2003 fmt->name,
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2004 pimage->width, pimage->height,
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2005 pimage->width * spec->scaleX, pimage->height * spec->scaleY,
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2006 spec->scaleX, spec->scaleY);
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	2007
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2008 if (image->pixfmt == DM_PIXFMT_PALETTE)
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	2009 {
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2010 switch (optRemapMode)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2011 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2012 case REMAP_NONE:
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2013 if (optPaletteData != NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2014 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2015 DMPalette *tpal;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2016
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2017 dmMsg(1, "Replacing image palette %d colors with %d colors.\n",
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2018 image->pal->ncolors, optPaletteData->ncolors);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2019
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2020 if ((res = dmPaletteCopy(&tpal, optPaletteData)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2021 return res;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2022
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2023 if (image->pal->ncolors != optPaletteData->ncolors)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2024 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2025 dmMsg(1, "Trying to resize to %d colors.\n",
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2026 image->pal->ncolors);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2027
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2028 if ((res = dmPaletteResize(&tpal, image->pal->ncolors)) != DMERR_OK)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2029 return res;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2030 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2031
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2032 dmPaletteFree(image->pal);
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2033 image->pal = tpal;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2034 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2035 break;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2036
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2037 case REMAP_MAPPED:
2500 5621befda8d6 Output a warning if REMAP_MAPPED is used together with palette replacement Matti Hamalainen <ccr@tnsp.org> parents: 2499 diff changeset	2038 if (optPaletteData != NULL)
5621befda8d6 Output a warning if REMAP_MAPPED is used together with palette replacement Matti Hamalainen <ccr@tnsp.org> parents: 2499 diff changeset	2039 {
5621befda8d6 Output a warning if REMAP_MAPPED is used together with palette replacement Matti Hamalainen <ccr@tnsp.org> parents: 2499 diff changeset	2040 dmErrorMsg(
5621befda8d6 Output a warning if REMAP_MAPPED is used together with palette replacement Matti Hamalainen <ccr@tnsp.org> parents: 2499 diff changeset	2041 "WARNING: Color remapping requested, but palette replacement (-p) set. This will have no effect.\n");
5621befda8d6 Output a warning if REMAP_MAPPED is used together with palette replacement Matti Hamalainen <ccr@tnsp.org> parents: 2499 diff changeset	2042 }
5621befda8d6 Output a warning if REMAP_MAPPED is used together with palette replacement Matti Hamalainen <ccr@tnsp.org> parents: 2499 diff changeset	2043
2497 ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2044 if ((res = dmMapImageColors(
ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2045 &image, pimage, optRemapTable, optNRemapTable,
ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2046 optRemapMaxDist, optRemapNoMatchColor,
ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2047 optRemapMatchAlpha, optRemapRemove)) != DMERR_OK)
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2048 goto out;
2497 ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2049
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2050 allocated = TRUE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2051 break;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2052
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2053 case REMAP_AUTO:
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2054 if (optPaletteData == NULL)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2055 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2056 dmErrorMsg(
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2057 "Color auto-remapping requested, but target palette not set? (-p option)\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2058 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2059 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2060
2497 ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2061 if ((res = dmRemapImageColors(
ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2062 &image, pimage, optPaletteData,
2487 14a4f8d78fe6 More work on image palette remapping functionality. Matti Hamalainen <ccr@tnsp.org> parents: 2485 diff changeset	2063 optRemapMaxDist, optRemapNoMatchColor,
2497 ea5929b04a26 Oooops, forgot to commit these changes to color remapping stuff. 100L. Matti Hamalainen <ccr@tnsp.org> parents: 2496 diff changeset	2064 optRemapMatchAlpha, optRemapRemove)) != DMERR_OK)
2481 f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2065 goto out;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2066
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2067 allocated = TRUE;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2068 break;
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2069 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2070 }
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2071 else
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2072 if (optRemapMode != REMAP_NONE)
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2073 {
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2074 dmErrorMsg("Color remapping requested, but image is not paletted?\n");
f3d9cdb0a295 Some work towards more flexible palette remapping. Matti Hamalainen <ccr@tnsp.org> parents: 2468 diff changeset	2075 goto out;
473 73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	2076 }
73bfe73553eb Implement palette remapping option for image outputs. Matti Hamalainen <ccr@tnsp.org> parents: 471 diff changeset	2077
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	2078 // Determine number of planes, if paletted
2142 894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2079 if (spec->nplanes == 0)
894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2080 {
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2081 if (image->pixfmt == DM_PIXFMT_PALETTE &&
2142 894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2082 image->pal != NULL)
894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2083 spec->nplanes = dmGetNPlanesFromNColors(image->pal->ncolors);
894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2084 else
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2085 if (image->pixfmt == DM_PIXFMT_GRAYSCALE)
2142 894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2086 spec->nplanes = image->bpp;
894781b7310a Possibly fix RAW output when clipping nplanes/bpp. Matti Hamalainen <ccr@tnsp.org> parents: 2137 diff changeset	2087 }
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	2088
2100 81fb21dd3265 Add dmGetNPlanesFromNColors() and use it. Matti Hamalainen <ccr@tnsp.org> parents: 2099 diff changeset	2089 if (spec->nplanes <= 0)
2099 dac89484f143 Fix nplanes and bpp in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2097 diff changeset	2090 spec->nplanes = 4;
dac89484f143 Fix nplanes and bpp in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2097 diff changeset	2091
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	2092 spec->fmtid = fmt->fmtid;
451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	2093
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2094 // 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	2095 switch (fmt->fmtid)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2096 {
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	2097 case DM_IMGFMT_PNG:
2155 28b7a842181f Make PNG/PPM output a bit more sane with -P option and grayscale data. Matti Hamalainen <ccr@tnsp.org> parents: 2144 diff changeset	2098 if (optUsePalette)
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2099 spec->pixfmt = (image->pixfmt == DM_PIXFMT_GRAYSCALE) ? DM_PIXFMT_GRAYSCALE : DM_PIXFMT_PALETTE;
2155 28b7a842181f Make PNG/PPM output a bit more sane with -P option and grayscale data. Matti Hamalainen <ccr@tnsp.org> parents: 2144 diff changeset	2100 else
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2101 spec->pixfmt = DM_PIXFMT_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	2102 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	2103
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	2104 case DM_IMGFMT_PPM:
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2105 if (optUsePalette && image->pixfmt == DM_PIXFMT_GRAYSCALE)
9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2106 spec->pixfmt = DM_PIXFMT_GRAYSCALE;
2155 28b7a842181f Make PNG/PPM output a bit more sane with -P option and grayscale data. Matti Hamalainen <ccr@tnsp.org> parents: 2144 diff changeset	2107 else
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2108 spec->pixfmt = DM_PIXFMT_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	2109 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	2110
1543 416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	2111 case DM_IMGFMT_RAW:
416d7b3ba3b2 Rename libgfx IMGFMT_* constants to DM_IMGFMT_. Matti Hamalainen <ccr@tnsp.org>* parents: 1537 diff changeset	2112 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	2113 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2114 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	2115 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	2116 (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	2117 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2118 res = dmError(DMERR_MALLOC,
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2119 "Could not allocate memory for filename strings? :O\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2120 goto out;
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	2121 }
820 e3fa646aef0d Use dm_strdup_fext(). Matti Hamalainen <ccr@tnsp.org> parents: 819 diff changeset	2122
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2123 // 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	2124 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	2125 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	2126
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2127 dmMsg(2, "%d bitplanes, %s planes output.\n",
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2128 spec->nplanes,
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2129 spec->planar ? "planar/interleaved" : "non-interleaved");
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2130 dmMsg(2, "%s datafile '%s', ID prefix '%s'.\n",
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2131 fmt->fmtid == DM_IMGFMT_ARAW ? "ARAW" : "RAW",
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2132 hdrFilename, prefix);
1891 91b80990043c Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1890 diff changeset	2133
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2134 res = dmWriteIFFMasterRAWHeaderFile(
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	2135 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	2136
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2137 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	2138 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	2139 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2140 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	2141
2065 451980580189 Refactor how paletted/indexed formats are handled in libgfx. Matti Hamalainen <ccr@tnsp.org> parents: 2062 diff changeset	2142 default:
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2143 spec->pixfmt = optUsePalette ? DM_PIXFMT_PALETTE : DM_PIXFMT_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	2144 break;
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2145 }
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2146
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2147 // 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	2148 if (res == DMERR_OK)
4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2149 {
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2150 DMResource *fp;
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2151 char *str;
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2152 switch (spec->pixfmt)
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2153 {
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2154 case DM_PIXFMT_PALETTE : str = "indexed/paletted"; break;
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2155 case DM_PIXFMT_RGB : str = "24bit RGB"; break;
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2156 case DM_PIXFMT_RGBA : str = "32bit RGBA"; break;
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2157 case DM_PIXFMT_GRAYSCALE : str = "grayscale"; break;
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2158 default : str = "???"; break;
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2159 }
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2160 dmMsg(1, "Using %s output.\n", str);
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2161
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2162 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	2163 {
2460 2723cf62d039 Improve few error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2459 diff changeset	2164 dmErrorMsg("Could not open file '%s' for writing: %s\n",
2723cf62d039 Improve few error messages. Matti Hamalainen <ccr@tnsp.org> parents: 2459 diff changeset	2165 filename, dmErrorStr(res));
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2166 goto out;
1886 1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2167 }
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2168
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2169 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	2170
1af79412f249 Remove the stdio FILE support from libgfx API, now only DMResource is supported. Matti Hamalainen <ccr@tnsp.org> parents: 1874 diff changeset	2171 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	2172 }
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	2173
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2174 out:
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	2175 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	2176 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	2177
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	2178 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	2179 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2180
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2181
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2182 int dmWritePalette(const char filename, const DMPalette palette, const DMPaletteFormat *fmt)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2183 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2184 DMResource *fp = NULL;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2185 int res;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2186
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2187 // Check if writing is even supported
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2188 if (fmt->write == NULL \|\| (fmt->flags & DM_FMT_WR) == 0)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2189 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2190 return dmError(DMERR_NOT_SUPPORTED,
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2191 "Writing of '%s' format is not supported.\n",
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2192 fmt->name);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2193 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2194
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2195 dmMsg(1, "Outputting '%s' format palette of %d entries.\n",
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2196 fmt->name, palette->ncolors);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2197
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2198 if ((res = dmf_open_stdio(filename, "wb", &fp)) != DMERR_OK)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2199 {
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2200 dmErrorMsg("Could not open file '%s' for writing: %s\n",
567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2201 filename, dmErrorStr(res));
567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2202 goto out;
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2203 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2204
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2205 res = fmt->write(fp, palette);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2206
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2207 out:
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2208 dmf_close(fp);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2209
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2210 return res;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2211 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2212
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2213
2454 375da267d994 Un-staticize functions in the main program. Matti Hamalainen <ccr@tnsp.org> parents: 2453 diff changeset	2214 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	2215 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2216 Uint8 byte = 0;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2217 int xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2218
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2219 if (multicolor)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2220 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2221 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	2222 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2223 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	2224 byte \|= pixel << (6 - (xc * 2));
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2225 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2226 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2227 else
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2228 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2229 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	2230 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2231 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	2232 byte \|= pixel << (7 - xc);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2233 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2234 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2235
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2236 return byte;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2237 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2238
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2239
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2240 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	2241 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	2242 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2243 int yc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2244
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2245 if (xoffs < 0 \|\| yoffs < 0 \|\|
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2246 xoffs + D64_CHR_WIDTH_PX > image->width \|\|
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2247 yoffs + D64_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	2248 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2249
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2250 for (yc = 0; yc < D64_CHR_HEIGHT_UT; yc++)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2251 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2252 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	2253 buf[yc] = dmConvertByte(sp, multicolor);
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2254 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2255
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2256 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2257 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2258
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2259
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2260 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	2261 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	2262 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2263 int yc, xc;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2264
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2265 if (xoffs < 0 \|\| yoffs < 0 \|\|
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2266 xoffs + D64_SPR_WIDTH_PX > image->width \|\|
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2267 yoffs + D64_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	2268 return FALSE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2269
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2270 for (yc = 0; yc < D64_SPR_HEIGHT_UT; yc++)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2271 {
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2272 for (xc = 0; xc < D64_SPR_WIDTH_PX / D64_SPR_WIDTH_UT; xc++)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2273 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2274 const Uint8 sp = image->data + ((yc + yoffs) image->pitch) + (xc * 8) + xoffs;
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2275 buf[(yc * D64_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	2276 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2277 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2278
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2279 return TRUE;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2280 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2281
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2282
1928 0b2a2da4c7e7 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 1916 diff changeset	2283 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	2284 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2285 int ret = DMERR_OK;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2286 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	2287 FILE *outFile = NULL;
2256 fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2288 Uint8 *tmpBuf = NULL;
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	2289 size_t outBufSize;
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2290 char *outType;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2291
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2292 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2293 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2294 case FFMT_CHAR:
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2295 outBufSize = D64_CHR_SIZE;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2296 outBlockW = image->width / D64_CHR_WIDTH_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2297 outBlockH = image->height / D64_CHR_HEIGHT_PX;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2298 outType = "char";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2299 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2300
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2301 case FFMT_SPRITE:
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2302 outBufSize = D64_SPR_SIZE;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2303 outBlockW = image->width / D64_SPR_WIDTH_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2304 outBlockH = image->height / D64_SPR_HEIGHT_PX;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2305 outType = "sprite";
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2306 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2307
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2308 default:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2309 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2310 "Invalid output format %d, internal error.\n", outFormat);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2311 goto out;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2312 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2313
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2314 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	2315 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2316 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2317 "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	2318 outBlockW, outBlockH);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2319 goto out;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2320 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2321
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2322 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	2323 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2324 ret = dmGetErrno();
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2325 dmErrorMsg("Could not open '%s' for writing: %s.\n",
68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2326 filename, dmErrorStr(ret));
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2327 goto out;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2328 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2329
2256 fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2330 if ((tmpBuf = dmMalloc(outBufSize)) == NULL)
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2331 {
2384 36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2332 dmErrorMsg("Could not allocate %" DM_PRIu_SIZE_T
36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2333 " bytes for conversion buffer.\n",
907 bc6c338295e5 Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 902 diff changeset	2334 outBufSize);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2335 goto out;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2336 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2337
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2338 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	2339 outBlockW, outBlockH, outBlockW * outBlockH, outType);
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2340
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2341 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	2342 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	2343 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2344 switch (outFormat)
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2345 {
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2346 case FFMT_CHAR:
2256 fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2347 if (!dmConvertImage2Char(tmpBuf, image,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2348 bx * D64_CHR_WIDTH_PX, by * D64_CHR_HEIGHT_PX,
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2349 multicolor))
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2350 {
be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2351 ret = DMERR_DATA_ERROR;
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2352 goto out;
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2353 }
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2354 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2355
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2356 case FFMT_SPRITE:
2256 fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2357 if (!dmConvertImage2Sprite(tmpBuf, image,
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2358 bx * D64_SPR_WIDTH_PX, by * D64_SPR_HEIGHT_PX,
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2359 multicolor))
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2360 {
be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2361 ret = DMERR_DATA_ERROR;
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2362 goto out;
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2363 }
910 43a71b097f17 10L. Matti Hamalainen <ccr@tnsp.org> parents: 909 diff changeset	2364 break;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2365 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2366
2256 fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2367 if (!dm_fwrite_str(outFile, tmpBuf, outBufSize))
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2368 {
909 be5d276f8a6c Some work on error handling. Matti Hamalainen <ccr@tnsp.org> parents: 907 diff changeset	2369 ret = dmGetErrno();
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2370 dmError(ret, "Error writing data block %d,%d to '%s': %s.\n",
68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2371 bx, by, filename, dmErrorStr(ret));
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2372 goto out;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2373 }
829 97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2374 }
97700378ecd8 Oops, accidentally committed unfinished code :S Matti Hamalainen <ccr@tnsp.org> parents: 828 diff changeset	2375
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2376 out:
2292 9269a32ba7f9 Comment. Matti Hamalainen <ccr@tnsp.org> parents: 2265 diff changeset	2377 // Cleanup
828 c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	2378 if (outFile != NULL)
c20a99411a1a Fix a silly segfault. Matti Hamalainen <ccr@tnsp.org> parents: 827 diff changeset	2379 fclose(outFile);
2256 fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2380
fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2381 dmFree(tmpBuf);
fe974f670d1d Rename a variable. Matti Hamalainen <ccr@tnsp.org> parents: 2242 diff changeset	2382
910 43a71b097f17 10L. Matti Hamalainen <ccr@tnsp.org> parents: 909 diff changeset	2383 return ret;
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2384 }
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	2385
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	2386
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2387 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	2388 {
1524 532c3ceaec1a Fix uninitilized variable. Matti Hamalainen <ccr@tnsp.org> parents: 1522 diff changeset	2389 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	2390 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	2391
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2392 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	2393 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2394 case FFMT_CHAR:
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2395 outSize = D64_CHR_SIZE;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2396 outWidth = D64_CHR_WIDTH_UT;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2397 outWidthPX = D64_CHR_WIDTH_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2398 outHeight = D64_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	2399 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2400
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2401 case FFMT_SPRITE:
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2402 outSize = D64_SPR_SIZE;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2403 outWidth = D64_SPR_WIDTH_UT;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2404 outWidthPX = D64_SPR_WIDTH_PX;
56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2405 outHeight = D64_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	2406 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2407
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2408 default:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2409 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	2410 "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	2411 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2412
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2413 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	2414 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	2415
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2416 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	2417 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2418 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	2419 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	2420
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2421 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	2422 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	2423 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2424 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	2425 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2426 ret = dmGetErrno();
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2427 dmError(ret, "Error opening output file '%s': %s.\n",
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	2428 optOutFilename, dmErrorStr(ret));
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2429 goto 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	2430 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2431
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2432 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	2433 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2434 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	2435
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2436 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	2437 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2438 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	2439 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	2440 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2441 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	2442 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	2443 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2444 }
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2445 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	2446 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2447 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2448
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2449 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	2450 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2451 else
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2452 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	2453 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2454 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	2455 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	2456 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	2457
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2458 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	2459 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2460 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	2461 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2462 dmErrorMsg("Sequential image output requires filename template.\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2463 goto 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	2464 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2465
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2466 outImage = dmImageAlloc(outWidthPX, outHeight, DM_PIXFMT_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	2467 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	2468 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2469 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	2470 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	2471 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	2472 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2473 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2474 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2475 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	2476 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	2477 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2478 dmErrorMsg("Single-image output requires count to be set (-n).\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2479 goto 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	2480 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2481
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2482 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	2483 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	2484 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	2485 outIHeight++;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2486
2157 9a9493809b3a Rename DM_COLFMT_* constants to DM_PIXFMT_* and the 'format' field of DMImage Matti Hamalainen <ccr@tnsp.org> parents: 2156 diff changeset	2487 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight, DM_PIXFMT_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	2488 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2489
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	2490 if ((err = dmC64SetImagePalette(outImage, &optC64Spec, FALSE)) != DMERR_OK)
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	2491 {
4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	2492 dmErrorMsg("Could not allocate C64 palette for output image: %d\n", err);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2493 goto out;
2094 4276b8c0fef0 Revamp how the DMImage palette system and color formats work, as preparation Matti Hamalainen <ccr@tnsp.org> parents: 2079 diff changeset	2494 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2495
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2496 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	2497 {
827 c8beac5313c3 Rename a function. Matti Hamalainen <ccr@tnsp.org> parents: 826 diff changeset	2498 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	2499 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	2500 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2501 dmErrorMsg("Internal error in conversion of raw data to bitmap: %d.\n", err);
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2502 goto 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	2503 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2504
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2505 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	2506 {
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2507 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	2508 optOutFilename,
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2509 itemCount,
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2510 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	2511
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2512 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	2513 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2514 dmErrorMsg("Could not allocate memory for filename template?\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2515 goto 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	2516 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2517
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2518 ret = dmWriteImage(outFilename, outImage, &optSpec,
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2519 &dmImageFormatList[optOutFormat]);
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2520
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2521 if (ret != DMERR_OK)
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	2522 {
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	2523 dmErrorMsg("Error writing output image '%s': %s.\n",
9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	2524 outFilename, dmErrorStr(ret));
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	2525 }
5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	2526
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2527 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	2528 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2529 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2530 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2531 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	2532 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2533 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	2534 outY++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2535 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2536 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2537
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2538 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	2539 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2540 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2541
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2542 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	2543 {
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	2544 ret = dmWriteImage(optOutFilename, outImage, &optSpec,
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2545 &dmImageFormatList[optOutFormat]);
f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	2546
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2547 if (ret != DMERR_OK)
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	2548 {
1525 9602f7ea1e7e Improve some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1524 diff changeset	2549 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	2550 optOutFilename, dmErrorStr(ret));
799 5ec451795ab2 Add some error checking. Matti Hamalainen <ccr@tnsp.org> parents: 652 diff changeset	2551 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2552 }
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2553
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2554 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	2555 }
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2556 else
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2557 if (optOutType == FFMT_BITMAP)
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2558 {
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2559 if (optSequential)
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2560 {
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2561 ret = dmError(DMERR_INVALID_ARGS,
6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2562 "Sequential output not supported for spr/char -> bitmap conversion.\n");
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2563 goto out;
607 360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2564 }
360b1ad83ed9 Rename things; Fix build by combining the conflicting rules. Matti Hamalainen <ccr@tnsp.org> parents: 566 diff changeset	2565 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2566
2459 567b4543f73b Rename labels more unformly. Matti Hamalainen <ccr@tnsp.org> parents: 2456 diff changeset	2567 out:
972 6d5edc6af2ad Error handling cleanups/fixes. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	2568 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	2569 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2570
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2571
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2572 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	2573 {
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	2574 FILE *inFile = NULL;
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	2575 const DMC64ImageFormat *inC64Fmt = NULL;
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2576 DMConvFormat inFormat, outFormat;
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	2577 DMC64Image inC64Image = NULL, outC64Image = NULL;
2052 aa8df4f1b785 Fix minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2030 diff changeset	2578 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	2579 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	2580 size_t dataSize, dataSizeOrig, dataRealOffs;
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2581 int i, n, 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	2582
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	2583 // Default color mapping
2125 56d4dc81774b Rename various C64_* constants to D64_. Matti Hamalainen <ccr@tnsp.org>* parents: 2124 diff changeset	2584 for (i = 0; i < D64_NCOLORS; i++)
1865 3e830bcb001a Improve color map and ANSI output support. Matti Hamalainen <ccr@tnsp.org> parents: 1864 diff changeset	2585 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	2586
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2587 // Initialize c64 image conversion spec
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	2588 memset(&optC64Spec, 0, sizeof(optC64Spec));
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	2589
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2590 // Initialize list of additional conversion formats
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2591 if ((res = dmLib64GFXInit()) != DMERR_OK)
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2592 {
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2593 dmErrorMsg("Could not initialize lib64gfx: %s\n",
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2594 dmErrorStr(res));
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2595 goto exit;
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2596 }
dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	2597
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2598 nconvFormatList = ndmImageFormatList + ndmPaletteFormatList + nbaseFormatList;
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2599 convFormatList = dmCalloc(nconvFormatList, sizeof(DMConvFormat));
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2600
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2601 for (n = i = 0; i < ndmImageFormatList; i++)
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2602 {
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2603 const DMImageFormat *sfmt = &dmImageFormatList[i];
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2604 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	2605 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	2606 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	2607 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	2608 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	2609 dfmt->format = sfmt->fmtid;
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2610 }
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2611
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2612 for (i = 0; i < ndmPaletteFormatList; i++)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2613 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2614 const DMPaletteFormat *sfmt = &dmPaletteFormatList[i];
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2615 DMConvFormat *dfmt = &convFormatList[n++];
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2616 dfmt->name = sfmt->name;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2617 dfmt->fext = sfmt->fext;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2618 dfmt->flags = sfmt->flags;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2619 dfmt->type = FFMT_PALETTE;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2620 dfmt->format = sfmt->fmtid;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2621 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2622
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2623
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2624 for (i = 0; i < nbaseFormatList; i++)
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2625 memcpy(&convFormatList[n++], &baseFormatList[i], sizeof(DMConvFormat));
36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2626
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2627 // Initialize and parse commandline
2499 b7d340e045fb Bump gfxconv version. Matti Hamalainen <ccr@tnsp.org> parents: 2498 diff changeset	2628 dmInitProg("gfxconv", "Simple graphics converter", "0.95", 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	2629
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2630 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	2631 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	2632 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	2633
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2634 // 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	2635 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	2636 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2637 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	2638 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	2639 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2640 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	2641 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	2642 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2643 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	2644 formatTypeList[optInType]);
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2645 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2646 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2647 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2648
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2649 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	2650 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2651 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	2652 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2653 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	2654 dmErrorMsg("Perhaps you should try using --help\n");
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2655 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2656 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2657 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	2658 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	2659 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2660 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2661 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	2662 {
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2663 res = dmGetErrno();
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2664 dmErrorMsg("Error opening input file '%s': %s\n",
68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	2665 optInFilename, dmErrorStr(res));
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2666 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2667 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2668
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2669 // 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	2670 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	2671 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2672 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	2673 if (dext)
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2674 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2675 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	2676 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	2677 {
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2678 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	2679 formatTypeList[optOutType]);
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2680 }
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2681 }
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2682 }
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2683 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	2684 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	2685 optOutType = FFMT_ASCII;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2686
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2687 // 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	2688 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	2689
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2690 if ((res = dmReadDataFile(inFile, NULL, &dataBufOrig, &dataSizeOrig)) != DMERR_OK)
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2691 {
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2692 dmErrorMsg("Could not read input: %s.\n", dmErrorStr(res));
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2693 goto exit;
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2694 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2695
1664 9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	2696 fclose(inFile);
9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	2697
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2698 // 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	2699 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	2700 {
2010 09d548b08150 Improve input skip option messages. Matti Hamalainen <ccr@tnsp.org> parents: 2006 diff changeset	2701 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	2702 optInSkip, optInSkip, dataSizeOrig);
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2703 goto exit;
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2704 }
c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2705
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2706 if (optInSkipNeg)
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2707 {
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2708 dataBuf = dataBufOrig + dataSizeOrig - optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2709 dataSize = optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2710 dataRealOffs = dataSizeOrig - optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2711
2384 36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2712 dmMsg(1, "Input skip -%d (-0x%x). "
36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2713 "Offset %" DM_PRIu_SIZE_T " (0x%" DM_PRIx_SIZE_T "), "
36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2714 "size %" DM_PRIu_SIZE_T " (0x%" DM_PRIx_SIZE_T ").\n",
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2715 optInSkip, optInSkip,
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2716 dataRealOffs, dataRealOffs,
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2717 dataSize, dataSize);
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2718
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2719 }
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2720 else
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2721 {
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2722 dataBuf = dataBufOrig + optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2723 dataSize = dataSizeOrig - optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2724 dataRealOffs = optInSkip;
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2725
2384 36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2726 dmMsg(1, "Input skip %d (0x%x), "
36edd316184a Fix some format strings to use proper PRI_SIZE_T where necessary. Matti Hamalainen <ccr@tnsp.org>* parents: 2371 diff changeset	2727 "size %" DM_PRIu_SIZE_T " (0x%" DM_PRIx_SIZE_T ").\n",
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2728 optInSkip, optInSkip,
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2729 dataSize, dataSize);
2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2730 }
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2731
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2732 // 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	2733 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	2734 optInFormat = optForcedInSubFormat;
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2735
1479 c4755b73b93c Improve how input skipping is done. This, however, currently breaks skipping for Matti Hamalainen <ccr@tnsp.org> parents: 1470 diff changeset	2736 // 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	2737 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	2738 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2739 // Probe for format
516 6f141f760c54 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 509 diff changeset	2740 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	2741 DMGrowBuf tbuf;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2742
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	2743 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	2744 {
1867 15cbf17a8ea6 Make output format -f option symmetric with the -i input format option. Matti Hamalainen <ccr@tnsp.org> parents: 1866 diff changeset	2745 forced = &dmC64ImageFormats[optForcedInSubFormat];
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2746 dmMsg(0, "Forced '%s' format image, type %d, %s\n",
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	2747 forced->name, forced->format->mode, 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	2748 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2749
1747 5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	2750 res = dmC64DecodeBMP(&inC64Image,
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	2751 dmGrowBufConstCreateFrom(&tbuf, dataBuf, dataSize),
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	2752 0, 2, &inC64Fmt, forced);
5e928618fdc8 Change DMGrowBuf API somewhat and implement more copy operations. Matti Hamalainen <ccr@tnsp.org> parents: 1730 diff changeset	2753
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	2754 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	2755 {
1522 0d1cf72fb732 Clarify the "probed" messages of gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1514 diff changeset	2756 dmMsg(1, "Probed '%s' format image, type %d, %s\n",
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	2757 inC64Fmt->name, inC64Fmt->format->mode, inC64Fmt->fext);
1630 00e0d345e7f1 Improve autoprobing error handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1629 diff changeset	2758
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2759 optInType = FFMT_BITMAP;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2760 }
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	2761 else
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2762 if (res != DMERR_OK && (forced != NULL \|\| optInType == FFMT_BITMAP))
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	2763 {
1464 73e00bf7531c Improve one error message by showing the error code. Matti Hamalainen <ccr@tnsp.org> parents: 1457 diff changeset	2764 dmErrorMsg("Could not decode input image: %s.\n", dmErrorStr(res));
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2765 goto exit;
897 9541ea963e75 Add some error handling. Matti Hamalainen <ccr@tnsp.org> parents: 871 diff changeset	2766 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2767 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2768
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2769 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	2770 {
1616 36d073c45327 Refactor the format handling a bit. Matti Hamalainen <ccr@tnsp.org> parents: 1609 diff changeset	2771 const DMImageFormat *ifmt = NULL;
435 e4a3f183e463 Modularize some more. Matti Hamalainen <ccr@tnsp.org> parents: 432 diff changeset	2772 int index;
465 ffd5e730d313 Adjust verbosity levels. Matti Hamalainen <ccr@tnsp.org> parents: 463 diff changeset	2773 dmMsg(4, "Trying to probe image formats.\n");
2450 dc92cf744ad9 Check that the image format detected by dmImageProbeGeneric() has read() function defined. Matti Hamalainen <ccr@tnsp.org> parents: 2449 diff changeset	2774 if (dmImageProbeGeneric(dataBuf, dataSize, &ifmt, &index) > 0 &&
dc92cf744ad9 Check that the image format detected by dmImageProbeGeneric() has read() function defined. Matti Hamalainen <ccr@tnsp.org> parents: 2449 diff changeset	2775 ifmt->read != NULL)
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2776 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2777 optInType = FFMT_IMAGE;
a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2778 optInFormat = index;
1869 1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2779 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	2780 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2781 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2782
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2783 if (optInType == FFMT_AUTO \|\| optInType == FFMT_PALETTE)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2784 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2785 const DMPaletteFormat *pfmt = NULL;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2786 int index;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2787 dmMsg(4, "Trying to probe palette formats.\n");
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2788 if (dmPaletteProbeGeneric(dataBuf, dataSize, &pfmt, &index) > 0 &&
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2789 pfmt->read != NULL)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2790 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2791 optInType = FFMT_PALETTE;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2792 optInFormat = index;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2793 dmMsg(1, "Probed '%s' format palette.\n", pfmt->name);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2794 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2795 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2796
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2797 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	2798 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	2799 dmErrorMsg("No input format specified, and could not be determined automatically.\n");
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2800 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2801 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2802
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2803 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	2804 dmGetConvFormat(optOutType, optOutFormat, &outFormat))
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2805 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2806 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	2807 inFormat.name, inFormat.fext,
1067df067f28 Improve input/output format probe/forcing and related messages. Matti Hamalainen <ccr@tnsp.org> parents: 1867 diff changeset	2808 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	2809 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2810
2447 b0f25a42fd23 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2442 diff changeset	2811 // Check if we need to scale the output
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2812 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	2813 {
2464 7722c150d6de Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2461 diff changeset	2814 // Default to 1:1 scalefactors
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2815 int scaleX = 1, scaleY = 1;
2464 7722c150d6de Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2461 diff changeset	2816
7722c150d6de Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2461 diff changeset	2817 // For C64 formats, use the aspect ratios from them
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2818 if (inC64Fmt != NULL)
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2819 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2820 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	2821 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	2822 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2823
2464 7722c150d6de Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 2461 diff changeset	2824 // Then, depending on the scaling mode, apply scale
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2825 switch (optScaleMode)
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2826 {
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2827 case SCALE_AUTO:
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2828 optSpec.scaleX = scaleX;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2829 optSpec.scaleY = scaleY;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2830 break;
2070 41df24d1dfb6 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 2065 diff changeset	2831
2058 020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2832 case SCALE_RELATIVE:
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2833 optSpec.scaleX *= scaleX;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2834 optSpec.scaleY *= scaleY;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2835 break;
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2836 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2837 }
020f2151949a Implement support for the c64 format aspect rations and automatic scaling. Matti Hamalainen <ccr@tnsp.org> parents: 2052 diff changeset	2838
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2839 // Handle palette stuff that is generic for different operation modes
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2840 if (optPaletteFile != NULL &&
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2841 (res = dmHandleExternalPalette(optPaletteFile, &optPaletteData)) != DMERR_OK)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2842 goto exit;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2843
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2844 switch (optInType)
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	2845 {
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2846 case FFMT_SPRITE:
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2847 case FFMT_CHAR:
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2848 case FFMT_BITMAP:
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2849 if (optPaletteData == NULL)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2850 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2851 // No palette file specified, use internal palette
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2852 if (optC64Palette == NULL)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2853 optC64Palette = &dmC64DefaultPalettes[0];
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2854
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2855 dmMsg(1, "Using internal palette '%s' (%s).\n",
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2856 optC64Palette->name, optC64Palette->desc);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2857
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2858 if ((res = dmC64PaletteFromC64Palette(&optPaletteData, optC64Palette, FALSE)) != DMERR_OK)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2859 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2860 dmErrorMsg("Could not set up palette: %s.\n",
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2861 dmErrorStr(res));
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2862 goto exit;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2863 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2864 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2865
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2866 if (optPaletteData->ncolors < D64_NCOLORS)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2867 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2868 dmErrorMsg("Palette does not have enough colors (%d < %d)\n",
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2869 optPaletteData->ncolors, D64_NCOLORS);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2870 goto exit;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2871 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2872
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2873 if (optPaletteData->ncolors > D64_NCOLORS)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2874 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2875 dmMsg(1, "Palette has %d colors, using only first %d.\n",
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2876 optPaletteData->ncolors, D64_NCOLORS);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2877 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2878
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2879 optC64Spec.pal = optPaletteData;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2880 break;
2468 16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2881
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2882 default:
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2883 if (optC64Palette != NULL)
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2884 {
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2885 dmMsg(1, "Using internal palette '%s' (%s).\n",
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2886 optC64Palette->name, optC64Palette->desc);
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2887
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2888 if ((res = dmC64PaletteFromC64Palette(&optPaletteData, optC64Palette, FALSE)) != DMERR_OK)
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2889 {
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2890 dmErrorMsg("Could not set up palette: %s.\n",
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2891 dmErrorStr(res));
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2892 goto exit;
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2893 }
16c57206cef7 Enable the use of internal (C64) palettes for generally specifying a palette. Matti Hamalainen <ccr@tnsp.org> parents: 2467 diff changeset	2894 }
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	2895 }
90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	2896
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	2897 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	2898 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2899 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2900 case FFMT_CHAR:
2005 2ff214f811b4 Implement negative input data skip values for gfxconv -s option. Matti Hamalainen <ccr@tnsp.org> parents: 2004 diff changeset	2901 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	2902 break;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	2903
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2904 case FFMT_PALETTE:
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2905 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2906 const DMPaletteFormat *pfmt = &dmPaletteFormatList[optInFormat];
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2907 DMResource *fp;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2908
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2909 if (optOutFilename == NULL)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2910 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2911 dmErrorMsg("Output filename not set, required for palette formats.\n");
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2912 goto exit;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2913 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2914
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2915 // Read palette file
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2916 if ((res = dmf_open_memio(NULL, optInFilename, dataBuf, dataSize, &fp)) != DMERR_OK)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2917 {
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2918 dmErrorMsg("Could not create MemIO handle for input.\n");
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2919 goto exit;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2920 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2921
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2922 // Read input
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2923 if (pfmt->read != NULL)
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2924 res = pfmt->read(fp, &optPaletteData);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2925 else
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2926 dmErrorMsg("Unsupported input palette format.\n");
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2927
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2928 dmf_close(fp);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2929
2483 2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2930 if (res != DMERR_OK)
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2931 {
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2932 dmErrorMsg("Palette could not be read.\n");
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2933 goto exit;
2483 2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2934 }
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2935 }
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2936
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2937 if (optPaletteData == NULL)
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2938 goto exit;
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2939
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2940 switch (optOutType)
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2941 {
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2942 case FFMT_PALETTE:
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2943 res = dmWritePalette(optOutFilename, optPaletteData, &dmPaletteFormatList[optOutFormat]);
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2944 break;
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2945
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2946 case FFMT_IMAGE:
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2947 // Allocate image
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2948 if ((inImage = dmImageAlloc(16, 16, DM_PIXFMT_PALETTE,
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2949 dmGetNPlanesFromNColors(optPaletteData->ncolors))) == NULL)
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2950 {
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2951 res = dmError(DMERR_MALLOC,
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2952 "Could not allocate memory for image.\n");
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2953 goto exit;
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2954 }
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2955
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2956 if ((res = dmPaletteCopy(&inImage->pal, optPaletteData)) != DMERR_OK)
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2957 {
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2958 dmErrorMsg("Could not allocate image palette: %s\n",
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2959 dmErrorStr(res));
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2960 goto exit;
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2961 }
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2962
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2963 res = dmWriteImage(optOutFilename, inImage, &optSpec,
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2964 &dmImageFormatList[optOutFormat]);
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2965 break;
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2966
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2967 default:
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2968 dmErrorMsg("Unsupported output format for palette conversion.\n");
2d60e112255e Add support for converting palette to another palette format, or to a supported image format. Matti Hamalainen <ccr@tnsp.org> parents: 2481 diff changeset	2969 break;
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2970 }
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2971 break;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	2972
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	2973 case FFMT_BITMAP:
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2974 if (optOutFilename == 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	2975 {
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2976 dmErrorMsg("Output filename not set, required for bitmap formats.\n");
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	2977 goto exit;
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2978 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2979
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2980 switch (optOutType)
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2981 {
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2982 case FFMT_IMAGE:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2983 case FFMT_CHAR:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	2984 case FFMT_SPRITE:
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2985 // Set character data if required
2265 48b48251610a Refactor how the image "mode/type" is handled. It is still not perfect for Matti Hamalainen <ccr@tnsp.org> parents: 2256 diff changeset	2986 if ((inC64Image->extraInfo[D64_EI_MODE] & D64_FMT_CHAR) &&
2126 cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2987 inC64Image->charData[0].data == NULL)
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2988 {
2126 cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2989 // Check character ROM filename
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2990 if (optCharROMFilename == NULL)
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2991 optCharROMFilename = DM_DEF_CHARGEN;
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2992
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2993 // Attempt to read character ROM
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2994 dmMsg(1, "Using character ROM file '%s'.\n",
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2995 optCharROMFilename);
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2996
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	2997 if ((res = dmReadDataFile(NULL, optCharROMFilename,
2126 cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2998 &inC64Image->charData[0].data,
cffadb745484 Fix character ROM data handling. Matti Hamalainen <ccr@tnsp.org> parents: 2125 diff changeset	2999 &inC64Image->charData[0].size)) != DMERR_OK)
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3000 {
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3001 dmErrorMsg("Could not read character ROM from '%s'.\n",
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3002 optCharROMFilename);
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3003 goto exit;
2123 47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3004 }
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3005 }
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3006
47ddbedf5b56 Add initial support to 64vw and gfxconv for viewing and converting character Matti Hamalainen <ccr@tnsp.org> parents: 2120 diff changeset	3007 // Convert the image
2223 5477e792def3 Remove useless DMC64ImageFormat parameter from some conversion functions. Matti Hamalainen <ccr@tnsp.org> parents: 2217 diff changeset	3008 res = dmC64ConvertBMP2Image(&outImage, inC64Image, &optC64Spec);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3009
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3010 if (res != DMERR_OK \|\| outImage == NULL)
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3011 {
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	3012 dmErrorMsg("Error in bitmap to image conversion: %s.\n",
2295 046056326041 Show error code message when bitmap image conversion fails. Matti Hamalainen <ccr@tnsp.org> parents: 2292 diff changeset	3013 dmErrorStr(res));
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3014 goto exit;
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3015 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3016
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3017 switch (optOutType)
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3018 {
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3019 case FFMT_IMAGE:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3020 res = dmWriteImage(optOutFilename, outImage, &optSpec,
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	3021 &dmImageFormatList[optOutFormat]);
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3022 break;
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	3023
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3024 case FFMT_CHAR:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3025 case FFMT_SPRITE:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3026 res = dmWriteSpritesAndChars(optOutFilename, outImage,
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3027 optOutType, optInMulticolor);
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3028 break;
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3029 }
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3030 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3031
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3032 case FFMT_PALETTE:
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3033 res = dmWritePalette(optOutFilename, optPaletteData, &dmPaletteFormatList[optOutFormat]);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3034 break;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3035
2226 6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	3036 case FFMT_DUMP:
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	3037 dmDumpC64Bitmap(optOutFilename, inC64Image);
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	3038 break;
6037ba60730a Add output format for "dumping" c64 bitmap image structs data into separate Matti Hamalainen <ccr@tnsp.org> parents: 2223 diff changeset	3039
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3040 case FFMT_BITMAP:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3041 if ((res = dmConvertC64Bitmap(&outC64Image, inC64Image,
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3042 &dmC64ImageFormats[optOutFormat], inC64Fmt)) != DMERR_OK)
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3043 {
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3044 dmErrorMsg("Error in bitmap format conversion.\n");
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3045 goto exit;
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3046 }
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3047 if (dmVerbosity >= 2)
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3048 {
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3049 dmPrint(0, "INPUT:\n"); dmC64ImageDump(stderr, inC64Image, inC64Fmt, " ");
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3050 dmPrint(0, "OUTPUT:\n"); dmC64ImageDump(stderr, outC64Image, &dmC64ImageFormats[optOutFormat], " ");
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3051 }
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3052 res = dmWriteBitmap(optOutFilename, outC64Image, &dmC64ImageFormats[optOutFormat]);
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3053 break;
534 fbfdc9e4fe2b Begin preparations for improved bitmap conversion support. Breaks lib64gfx API. Matti Hamalainen <ccr@tnsp.org> parents: 530 diff changeset	3054
2097 f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3055 default:
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3056 dmErrorMsg("Unsupported output format for bitmap conversion.\n");
f43011ea9b9f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 2094 diff changeset	3057 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3058 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3059 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3060
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3061 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3062 {
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	3063 const DMImageFormat *ifmt = &dmImageFormatList[optInFormat];
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	3064 DMResource *fp;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3065
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3066 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3067 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 940 diff changeset	3068 dmErrorMsg("Output filename not set, required for image formats.\n");
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3069 goto exit;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3070 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3071
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	3072 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	3073 {
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	3074 dmErrorMsg("Could not create MemIO handle for input.\n");
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3075 goto exit;
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	3076 }
c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	3077
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3078 // 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	3079 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	3080 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	3081 else
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	3082 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	3083
1609 c29adf5ce240 Convert libgfx file format routines to use DMResource instead of stdio FILE. Matti Hamalainen <ccr@tnsp.org> parents: 1604 diff changeset	3084 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	3085
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	3086 if (res != DMERR_OK \|\| inImage == NULL)
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3087 goto exit;
1235 5b8245e5f785 Remove trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	3088
1909 a323ca23f449 Rename several variables to lessen the confusion about input/output "format" Matti Hamalainen <ccr@tnsp.org> parents: 1897 diff changeset	3089 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	3090 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3091 case FFMT_IMAGE:
1811 4f141426eb31 Clean up the image format output stuff in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 1807 diff changeset	3092 res = dmWriteImage(optOutFilename, inImage, &optSpec,
2456 f5f8001490ae Remove the unused "BOOL info" argument from dmWriteImage(). Matti Hamalainen <ccr@tnsp.org> parents: 2455 diff changeset	3093 &dmImageFormatList[optOutFormat]);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3094 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	3095
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3096 case FFMT_PALETTE:
2461 1ef7cdb8a5c1 Check that the source image has a palette when doing image -> palette conversion/extraction. Matti Hamalainen <ccr@tnsp.org> parents: 2460 diff changeset	3097 if (inImage->pal == NULL \|\| inImage->pixfmt != DM_PIXFMT_PALETTE)
1ef7cdb8a5c1 Check that the source image has a palette when doing image -> palette conversion/extraction. Matti Hamalainen <ccr@tnsp.org> parents: 2460 diff changeset	3098 {
1ef7cdb8a5c1 Check that the source image has a palette when doing image -> palette conversion/extraction. Matti Hamalainen <ccr@tnsp.org> parents: 2460 diff changeset	3099 dmErrorMsg("Source image is not a paletted format or has no palette.\n");
1ef7cdb8a5c1 Check that the source image has a palette when doing image -> palette conversion/extraction. Matti Hamalainen <ccr@tnsp.org> parents: 2460 diff changeset	3100 goto exit;
1ef7cdb8a5c1 Check that the source image has a palette when doing image -> palette conversion/extraction. Matti Hamalainen <ccr@tnsp.org> parents: 2460 diff changeset	3101 }
2453 11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3102 res = dmWritePalette(optOutFilename, inImage->pal, &dmPaletteFormatList[optOutFormat]);
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3103 break;
11151bc8d056 Implement functionality for converting the supported palette formats to Matti Hamalainen <ccr@tnsp.org> parents: 2452 diff changeset	3104
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	3105 case FFMT_CHAR:
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	3106 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	3107 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	3108 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	3109 break;
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3110
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3111 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	3112 {
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3113 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	3114 res = dmC64ConvertImage2BMP(&tmpC64Image, inImage,
2208 90ec1ec89c56 Revamp the palette handling in lib64gfx somewhat, add helper functions to Matti Hamalainen <ccr@tnsp.org> parents: 2204 diff changeset	3115 &dmC64ImageFormats[optOutFormat], &optC64Spec);
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3116
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3117 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	3118 {
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3119 dmC64ImageFree(tmpC64Image);
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	3120 dmErrorMsg("Error in image to bitmap conversion: %s.\n",
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3121 dmErrorStr(res));
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3122 goto exit;
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3123 }
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3124
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3125 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	3126 &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	3127 {
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3128 dmC64ImageFree(tmpC64Image);
2387 68efae89c034 Clean up some error messages in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2384 diff changeset	3129 dmErrorMsg("Error in bitmap format conversion: %s.\n",
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3130 dmErrorStr(res));
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3131 goto exit;
1931 410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3132 }
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3133
410679d2fe8a "Enable" the image->c64 bitmap conversion path in gfxconv. It does not work Matti Hamalainen <ccr@tnsp.org> parents: 1929 diff changeset	3134 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	3135 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	3136 }
489 fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	3137 break;
fca3c240ccac Implement simplistic image input to char/sprite splitter conversion. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	3138
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	3139 default:
1874 b386d339056f Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1873 diff changeset	3140 dmErrorMsg("Unsupported output format for image conversion.\n");
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	3141 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	3142 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3143 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3144 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3145 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3146
2451 2e2a6c344371 Move conversion final write error checking to a more generic location. Matti Hamalainen <ccr@tnsp.org> parents: 2450 diff changeset	3147 if (res != DMERR_OK)
2e2a6c344371 Move conversion final write error checking to a more generic location. Matti Hamalainen <ccr@tnsp.org> parents: 2450 diff changeset	3148 {
2e2a6c344371 Move conversion final write error checking to a more generic location. Matti Hamalainen <ccr@tnsp.org> parents: 2450 diff changeset	3149 dmErrorMsg("Error writing output data: %s\n",
2e2a6c344371 Move conversion final write error checking to a more generic location. Matti Hamalainen <ccr@tnsp.org> parents: 2450 diff changeset	3150 dmErrorStr(res));
2e2a6c344371 Move conversion final write error checking to a more generic location. Matti Hamalainen <ccr@tnsp.org> parents: 2450 diff changeset	3151 }
2e2a6c344371 Move conversion final write error checking to a more generic location. Matti Hamalainen <ccr@tnsp.org> parents: 2450 diff changeset	3152
2198 c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3153 exit:
c26a51ea70be Replace label 'error' with 'exit'. Matti Hamalainen <ccr@tnsp.org> parents: 2183 diff changeset	3154 // Cleanup
1664 9181d9148654 Fix a minor memory leak and file descriptor leak. Matti Hamalainen <ccr@tnsp.org> parents: 1640 diff changeset	3155 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	3156 dmFree(dataBufOrig);
2466 213ce6d400dc Free the allocated extra palette, if any. Matti Hamalainen <ccr@tnsp.org> parents: 2464 diff changeset	3157 dmPaletteFree(optPaletteData);
1440 a602488830fc Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1439 diff changeset	3158 dmC64ImageFree(inC64Image);
1490 665a0b917d22 Begin restructuring how C64 bitmaps are converted. Matti Hamalainen <ccr@tnsp.org> parents: 1481 diff changeset	3159 dmC64ImageFree(outC64Image);
2052 aa8df4f1b785 Fix minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2030 diff changeset	3160 dmImageFree(inImage);
aa8df4f1b785 Fix minor memory leaks in gfxconv. Matti Hamalainen <ccr@tnsp.org> parents: 2030 diff changeset	3161 dmImageFree(outImage);
2200 dcd26cdc395e Replace dmC64InitializeFormats() with dmLib64GFXInit() and dmLib64GFXClose(). Matti Hamalainen <ccr@tnsp.org> parents: 2198 diff changeset	3162 dmLib64GFXClose();
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	3163
933 8fe48c08dbca Fix some memory leaks etc. Matti Hamalainen <ccr@tnsp.org> parents: 931 diff changeset	3164 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	3165 }

Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 2503:7b55c7b6a300