Mercurial > hg > dmlib

annotate tools/gfxconv.c @ 2408:60e119262c67

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