dmlib: tools/gfxconv.c annotate

annotate tools/gfxconv.c @ 2492:1bd7387984ed

Add few comments to the -R sub-option parsing and remove dead code.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 28 Apr 2020 19:26:04 +0300
parents	ed2f56abda22
children	ec036e88a0c2

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

Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 2492:1bd7387984ed