dmlib: gfxconv.c annotate

annotate gfxconv.c @ 431:e3ebcbc4ace2

Cosmetics.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 03 Nov 2012 13:36:51 +0200
parents	77fae3e4e4d3
children	b583a682f12d

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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * (C) Copyright 2012 Tecnic Software productions (TNSP)
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 */
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include <errno.h>
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"
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	12 #include "dmbstr.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 "dmmutex.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 #include "lib64gfx.h"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 //#define UNFINISHED 1
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	18 #ifdef DM_USE_LIBPNG
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 #include <png.h>
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22 enum
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	24 IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	25 IMGFMT_PPM,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	26 IMGFMT_PCX,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	27 IMGFMT_ARAW,
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 IMGFMT_LAST
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	30 };
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	31
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	32 static const char *imageFormatList[IMGFMT_LAST] =
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	33 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	34 "PNG",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	35 "PPM",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	36 "PCX",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	37 "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	38 };
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 enum
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	42 FFMT_AUTO = 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	43
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	44 FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	45 FFMT_ANSI,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	46 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	47
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	48 FFMT_CHAR,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	49 FFMT_SPRITE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	50 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	51
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	52 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	53 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	55
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	56 typedef struct
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	57 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	58 char *name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	59 char *fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	60 BOOL in, out;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	61 int format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	62 int subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	63 } DMConvFormat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	64
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	65
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	66 static DMConvFormat convFormatList[] =
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	68 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	69 "ASCII text", "asc", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	70 FFMT_ASCII , 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	71 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	72 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	73 "ANSI colored text", "ansi", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	74 FFMT_ANSI , 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	75 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	76 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	77 "PNG image file", "png", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	78 FFMT_IMAGE , IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	79 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	80 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	81 "PPM image file", "ppm", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	82 FFMT_IMAGE , IMGFMT_PPM,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	83 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	84 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	85 "PCX image file", "pcx", TRUE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	86 FFMT_IMAGE , IMGFMT_PCX,
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 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	89 "IFFMaster RAW image file", "araw", FALSE, TRUE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	90 FFMT_IMAGE , IMGFMT_ARAW,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	91 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	92
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	93 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	94 "C64 bitmap image file", NULL, TRUE, FALSE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	95 FFMT_BITMAP , 0,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	96 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	97
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	98 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	99 "C64 character/font data", "chr", TRUE, FALSE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	100 FFMT_CHAR , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	101 },
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	102 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	103 "C64 sprite data", "spr", TRUE, FALSE,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	104 FFMT_SPRITE , 0
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	105 },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	108 static const int nconvFormatList = sizeof(convFormatList) / sizeof(convFormatList[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	109
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 #define ASC_NBITS 8
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 #define ASC_NCOLORS 4
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 static const char dmASCIIPalette[ASC_NCOLORS] = ".:X#";
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 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	117 *optOutFilename = NULL;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	118 int optInFormat = FFMT_AUTO,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	119 optOutFormat = FFMT_ASCII,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	120 optInSubFormat = IMGFMT_PNG,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	121 optOutSubFormat = IMGFMT_PNG,
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 optScale = 2,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 optPlanedWidth = 1,
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	125 optForcedFormat = -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	126 optBPP = 4;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 int optInSkip = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 BOOL optInMulticolor = FALSE,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 optSequential = FALSE,
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	130 optPaletted = FALSE,
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	131 optInterleave = 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	132 int optColors[C64_MAX_COLORS];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 static DMOptArg optList[] =
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 {
431 e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	137 { 0, '?', "help", "Show this help", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	138 { 15, 'v', "verbose", "Increase verbosity", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	139 { 3, 'o', "output", "Output filename", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	140 { 1, 'i', "informat", "Set input format ([s]prite, [c]har, [b]itmap, [i]mage)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	141 { 2, 'm', "multicolor", "Input is multicolor", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	142 { 4, 's', "skip", "Skip bytes in input", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	143 { 5, 'f', "format", "Output format (see list below)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	144 { 8, 'q', "sequential", "Output sequential files (image output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	145 { 6, 'c', "colormap", "Color mappings (see below for information)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	146 { 7, 'n', "numitems", "How many 'items' to view (default: all)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	147 { 9, 'S', "scale", "Scale output by x (image output only)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	148 { 10, 'b', "bformat", "Force input bitmap format (see below)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	149 { 11, 'w', "width", "Item width (number of items per row, min 1)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	150 { 12, 'P', "paletted", "Use indexed/paletted output (png, pcx output only)", OPT_NONE },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	151 { 13, 'B', "bplanes", "Bits per pixel OR # of bitplanes (certain output formats)", OPT_ARGREQ },
e3ebcbc4ace2 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 430 diff changeset	152 { 14, 'I', "interleave", "Interleave scanlines (default: output whole planes)", OPT_NONE },
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 };
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 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	156
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 void argShowHelp()
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 dmPrintBanner(stdout, dmProgName, "[options] <input file>");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 dmArgsPrintHelp(stdout, optList, optListN);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	165 printf("\nAvailable output formats:\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	166 for (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	167 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	168 DMConvFormat *fmt = &convFormatList[i];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	169 printf("%3d \| %-5s \| %s\n",
428 983c557f2fbf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 423 diff changeset	170 i, fmt->fext ? fmt->fext : "", fmt->name);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 printf("\nAvailable bitmap formats:\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 for (i = 0; i < ndmC64ImageFormats; i++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	176 DMC64ImageFormat *fmt = &dmC64ImageFormats[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	177 printf("%3d \| %-5s \| %-15s \| %s\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 i, fmt->extension,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 dmC64ImageTypeNames[fmt->type],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 fmt->name);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 printf(
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 "\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 "Color map definitions are used for ANSI, PCX, PPM and PNG output, to declare what\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 "output colors of the C64 palette are used for each single color/multi color\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 "bit-combination. For example, if the input is multi color sprite or char,\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 "you can define colors like: -c 0,8,3,15 .. for single color: -c 0,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	189 "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	190 "00, 01, 10, 11 (multi color) and 0, 1 (single color). NOTICE! 255 is the\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 "special color that can be used for transparency.\n"
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 );
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	194
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	195
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	196 int dmGetConvFormat(int format, int subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	197 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	198 int i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	199 for (i = 0; i < nconvFormatList; i++)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	200 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	201 DMConvFormat *fmt = &convFormatList[i];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	202 if (fmt->format == format &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	203 fmt->subformat == subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	204 return i;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	205 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	206 return -1;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	207 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	208
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	209
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	210 BOOL dmGetFormatByExt(const char fext, int format, int *subformat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	211 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	212 int 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	213 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	214 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	215
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	216 for (i = 0; i < nconvFormatList; i++)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	217 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	218 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	219 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	220 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	221 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	222 *format = fmt->format;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	223 *subformat = fmt->subformat;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	224 return TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	225 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	226 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	227 return FALSE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	228 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	229
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	230
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 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	232 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233 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	234 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 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	236 argShowHelp();
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 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	238 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	240 case 15:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	241 dmVerbosity++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	242 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	243
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 case 1:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245 switch (tolower(optArg[0]))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 case 's':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	248 optInFormat = FFMT_SPRITE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 case 'c':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	251 optInFormat = FFMT_CHAR;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 break;
416 238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	253 case 'b':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	254 optInFormat = FFMT_BITMAP;
416 238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	255 break;
238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	256 case 'i':
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	257 optInFormat = FFMT_IMAGE;
416 238e6baf01a8 Add bitmap and image input selectors to -i option. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	258 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	259 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 dmError("Invalid input format '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 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	262 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 case 2:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 optInMulticolor = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 break;
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 case 3:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 optOutFilename = optArg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273 case 4:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 if (!dmGetIntVal(optArg, &optInSkip))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 dmError("Invalid skip value argument '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 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	278 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	281 case 5:
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	282 if (!dmGetFormatByExt(optArg, &optOutFormat, &optOutSubFormat))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	284 dmError("Invalid output format '%s'.\n", optArg);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	285 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	286 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 case 6:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 int index = 0, tmp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 char s, p = optArg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 while (index < C64_MAX_COLORS && *p != 0 && (s = strchr(p, ':')) != NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 *s = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 if (sscanf(p, "%d", &tmp) == 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 optColors[index++] = tmp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 p = s + 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 if (*p && index < C64_MAX_COLORS)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 if (sscanf(p, "%d", &tmp) == 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 optColors[index++] = tmp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308 dmMsg(1, "Set color table: ");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 for (tmp = 0; tmp < index; tmp++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311 dmPrint(1, "[%d:%d]%s",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312 tmp, optColors[tmp],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 (tmp < index - 1) ? ", " : "");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 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	316 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	318
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319 case 7:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 if (sscanf(optArg, "%d", &optItemCount) != 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 dmError("Invalid count value argument '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323 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	324 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 case 8:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 optSequential = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 case 9:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333 int tmp = atoi(optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 if (tmp < 1 \|\| tmp > 50)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	335 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 dmError("Invalid scale value '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 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	338 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 optScale = tmp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 case 11:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 int tmp = atoi(optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346 if (tmp < 1 \|\| tmp > 512)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 dmError("Invalid width value '%s'.\n", optArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 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	350 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 optPlanedWidth = tmp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 case 12:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 optPaletted = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	359 case 13:
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	360 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	361 int tmp = atoi(optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	362 if (tmp < 1 \|\| tmp > 8)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	363 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	364 dmError("Invalid bitplanes/bpp value '%s'.\n", optArg);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	365 return FALSE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	366 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	367 optBPP = tmp;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	368 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	369 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	370
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	371 case 14:
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	372 optInterleave = TRUE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	373 break;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	374
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376 dmError("Unknown option '%s'.\n", currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377 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	378 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380 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	381 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 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	385 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 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	387 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	388 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 dmError("Source filename already specified, extraneous argument '%s'.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 currArg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 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	393 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 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	396 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 void dmPrintByte(FILE *out, int byte, int format, BOOL multicolor)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 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	404 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 for (i = ASC_NBITS; i; i -= 2)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 int val = (byte & (3ULL << (i - 2))) >> (i - 2);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 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	409 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	410 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	411 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	412 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	413 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	414 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	415 case FFMT_ANSI:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 fprintf(out, "%c[0;%d;%dm##%c[0m",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 31 + optColors[val],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 for (i = ASC_NBITS; i; i--)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 int val = (byte & (1ULL << (i - 1))) >> (i - 1);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 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	431 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	432 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	433 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	434 ch = val ? '#' : '.';
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 fputc(ch, out);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	437 case FFMT_ANSI:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 fprintf(out, "%c[0;%d;%dm %c[0m",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 0x1b,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 1,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 31 + optColors[val],
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	442 0x1b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	443 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	445 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	448
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	450 void dmDumpCharASCII(FILE outFile, const Uint8 buf, int *offs, int format, 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	451 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452 int yc;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	454 for (yc = 0; yc < C64_CHR_HEIGHT; yc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	456 fprintf(outFile, "%04x : ", *offs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457 dmPrintByte(outFile, buf[yc], format, multicolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	458 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	459 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	464 void dmDumpSpriteASCII(FILE outFile, const Uint8 buf, int *offs, int format, 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	465 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 int bufOffs, xc, yc;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 for (bufOffs = yc = 0; yc < C64_SPR_HEIGHT; yc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 fprintf(outFile, "%04x : ", *offs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 for (xc = 0; xc < C64_SPR_WIDTH; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473 dmPrintByte(outFile, buf[bufOffs], format, multicolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 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	475 bufOffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 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	479 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 (*offs)++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	484 int dmWriteImageData(DMImage img, void cbdata, BOOL (writeRowCB)(void , Uint8 *, size_t), int scale, int format)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486 int x, y, yscale, xscale, res = 0, rowSize, rowWidth;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	487 Uint8 *row = 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	488
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 // Allocate memory for row buffer
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 rowWidth = img->width * scale;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 rowSize = rowWidth * dmImageGetBytesPerPixel(format);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 if ((row = dmMalloc(rowSize + 16)) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	495 res = DMERR_MALLOC;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496 goto done;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499 // Generate the image
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 for (y = 0; y < img->height; y++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	502 Uint8 *ptr = row,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 *ptr1 = row,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 *ptr2 = ptr1 + rowWidth,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505 *ptr3 = ptr2 + rowWidth;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 for (x = 0; x < img->width; x++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	509 Uint8 c = img->data[(y * img->pitch) + x], qr, qg, qb, qa;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 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	511 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 case DM_IFMT_PALETTE:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 for (xscale = 0; xscale < scale; xscale++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 *ptr++ = c;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517 case DM_IFMT_RGBA:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 qr = img->pal[c].r;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 qg = img->pal[c].g;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 qb = img->pal[c].b;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 qa = (c == img->ctrans) ? 0 : 255;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 for (xscale = 0; xscale < scale; xscale++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 *ptr++ = qr;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 *ptr++ = qg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 *ptr++ = qb;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 *ptr++ = qa;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 case DM_IFMT_RGB:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533 qr = img->pal[c].r;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 qg = img->pal[c].g;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 qb = img->pal[c].b;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 for (xscale = 0; xscale < scale; xscale++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539 *ptr++ = qr;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 *ptr++ = qg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 *ptr++ = qb;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 case DM_IFMT_RGB_PLANE:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 qr = img->pal[c].r;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 qg = img->pal[c].g;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 qb = img->pal[c].b;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 for (xscale = 0; xscale < scale; xscale++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 *ptr1++ = qr;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 *ptr2++ = qg;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 *ptr3++ = qb;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 for (yscale = 0; yscale < scale; yscale++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 if (!writeRowCB(cbdata, row, rowSize))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	564 res = DMERR_FWRITE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 goto done;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 done:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571 dmFree(row);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 #define DMCOL(x) (((x) >> 4) & 0xf)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 int dmWriteIFFMasterRAWPalette(const char filename, DMImage img, int ncolors)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 FILE *fp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 if ((fp = fopen(filename, "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	584 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 dmError("IFFMasterRAW: Could not open file '%s' for writing.\n", filename);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 return -15;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 for (i = 0; i < ncolors; i++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 int color;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 if (i < img->ncolors)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 color = (DMCOL(img->pal[i].r) << 8) \|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 (DMCOL(img->pal[i].g) << 4) \|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 (DMCOL(img->pal[i].b));
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 color = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 fprintf(fp, "\tdc.w $%04X\n", color);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604 return 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	608 int dmWriteIFFMasterRAWImageFILE(FILE fp, DMImage img, int scale, int nplanes, BOOL interleave)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 {
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	610 int xc, yc, plane, res;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	611 DMBitStream bs;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	612
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	613 if ((res = dmInitBitStream(&bs, fp)) != DMERR_OK)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	614 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	615
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	616 if (interleave)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 {
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	618 // Output bitplanes in interleaved format (each plane of line sequentially)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	619 for (yc = 0; yc < img->height; yc++)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	620 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	621 for (plane = 0; plane < nplanes; plane++)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	622 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	623 Uint8 sp = img->data + yc img->pitch;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	624 for (xc = 0; xc < img->width; xc++)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	625 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	626 if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1))
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	627 return DMERR_FWRITE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	628 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	629 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	630 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631 }
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	632 else
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	633 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	634 // Output each bitplane in sequence
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	635 for (plane = 0; plane < nplanes; plane++)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	636 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	637 for (yc = 0; yc < img->height; yc++)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	638 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	639 Uint8 sp = img->data + yc img->pitch;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	640 for (xc = 0; xc < img->width; xc++)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	641 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	642 if (!dmPutBits(&bs, (sp[xc] & (1 << plane)) ? 1 : 0, 1))
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	643 return DMERR_FWRITE;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	644 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	645 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	646 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	647 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	648
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	649 return dmFlushBitStream(&bs);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	652 int dmWriteIFFMasterRAWImage(const char filename, DMImage img, int scale, int nplanes, BOOL interleave)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 FILE *fp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 int res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 if ((fp = fopen(filename, "wb")) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659 dmError("IFFMasterRAW: Could not open file '%s' for writing.\n", filename);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	660 return DMERR_FOPEN;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	663 res = dmWriteIFFMasterRAWImageFILE(fp, img, scale, nplanes, interleave);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665 fclose(fp);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	670 static BOOL dmWritePPMRow(void cbdata, Uint8 row, size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	672 return fwrite(row, sizeof(Uint8), len, (FILE *) cbdata) == len;
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 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676 int dmWritePPMImageFILE(FILE fp, DMImage img, int scale)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678 // Write PPM header
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679 fprintf(fp,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680 "P6\n%d %d\n255\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 img->width * scale, img->height * scale);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 // Write image data
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 return dmWriteImageData(img, (void *) fp, dmWritePPMRow, scale, DM_IFMT_RGB);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 int dmWritePPMImage(const char filename, DMImage img, int scale)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 FILE *fp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 int res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693 // Create output file
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694 if ((fp = fopen(filename, "wb")) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 dmError("PPM: could not open file '%s' for writing.\n", filename);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	697 return DMERR_FOPEN;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700 res = dmWritePPMImageFILE(fp, img, scale);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 fclose(fp);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	707 #ifdef DM_USE_LIBPNG
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	708 static BOOL dmWritePNGRow(void cbdata, Uint8 row, size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	710 png_structp png_ptr = cbdata;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 (void) len;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	713 if (setjmp(png_jmpbuf(png_ptr)))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714 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	715
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716 png_write_row(png_ptr, row);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	718 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	719 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	720
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 int dmWritePNGImageFILE(FILE fp, DMImage img, int scale, int format)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	723 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 png_structp png_ptr = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 png_infop info_ptr = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 png_colorp palette = NULL;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	727 int fmt, 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	728
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	729 // Create PNG structures
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 png_ptr = png_create_write_struct(
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731 PNG_LIBPNG_VER_STRING,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732 NULL, NULL, NULL);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	733
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 if (png_ptr == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	736 dmError("PNG: png_create_write_struct() failed.\n");
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	737 res = DMERR_MALLOC;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 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	739 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	740
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 info_ptr = png_create_info_struct(png_ptr);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742 if (info_ptr == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	744 dmError("PNG: png_create_info_struct(%p) failed.\n", png_ptr);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	745 res = DMERR_INIT_FAIL;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 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	747 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749 if (setjmp(png_jmpbuf(png_ptr)))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	750 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	751 dmError("PNG: Error during image writing..\n");
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	752 res = DMERR_INIT_FAIL;
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 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	754 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	756 png_init_io(png_ptr, fp);
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 // Write PNG header info
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 switch (format)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 case DM_IFMT_PALETTE: fmt = PNG_COLOR_TYPE_PALETTE; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	762 case DM_IFMT_RGB : fmt = PNG_COLOR_TYPE_RGB; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 case DM_IFMT_RGBA : fmt = PNG_COLOR_TYPE_RGB_ALPHA; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765 dmError("PNG: Internal error, unsupported image format %d.\n", format);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 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	767 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 png_set_IHDR(png_ptr, info_ptr,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 img->width * scale,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 img->height * scale,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 8, /* bits per component */
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 fmt,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 PNG_INTERLACE_NONE,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 PNG_COMPRESSION_TYPE_DEFAULT,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776 PNG_FILTER_TYPE_DEFAULT);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 // Palette
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 if (format == DM_IFMT_PALETTE)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 palette = png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 if (palette == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 dmError("PNG: Could not allocate palette structure.");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 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	788 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	790 memset(palette, 0, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	792 for (i = 0; i < img->ncolors; i++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794 palette[i].red = img->pal[i].r;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 palette[i].green = img->pal[i].g;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796 palette[i].blue = img->pal[i].b;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	798
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 // png_set_gAMA(png_ptr, info_ptr, 2.2);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 png_write_info(png_ptr, info_ptr);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 // Write compressed image data
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 dmWriteImageData(img, (void *) png_ptr, dmWritePNGRow, scale, format);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 // Write footer
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811 png_write_end(png_ptr, NULL);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	813 error:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	814 png_free(png_ptr, palette);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815 palette = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 if (png_ptr && info_ptr)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818 png_destroy_write_struct(&png_ptr, &info_ptr);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	819
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	820 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	821 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 int dmWritePNGImage(const char filename, DMImage img, int scale, int format)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	825 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826 int res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827 FILE *fp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 if ((fp = fopen(filename, "wb")) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	831 dmError("PNG: could not open file '%s' for writing.\n", filename);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	832 return DMERR_FOPEN;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 res = dmWritePNGImageFILE(fp, img, scale, format);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837 fclose(fp);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	839 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	842
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843 typedef struct
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	844 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	845 Uint8 r,g,b;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	846 } DMPCXColor;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	847
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 typedef struct
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	850 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	851 Uint8 manufacturer,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	852 version,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853 encoding,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	854 bpp;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	855 Uint16 xmin, ymin, xmax, ymax;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	856 Uint16 hres, vres;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	857 DMPCXColor colormap[16];
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	858 Uint8 reserved;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	859 Uint8 nplanes;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	860 Uint16 bpl;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	861 Uint16 palinfo;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	862 Uint8 filler[58];
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863 } DMPCXHeader;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865 typedef struct
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867 DMPCXHeader *header;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	868 Uint8 *buf;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	869 size_t bufLen, bufOffs;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	870 int format;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871 FILE *fp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	872 } DMPCXData;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	874
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	875 static inline Uint8 dmPCXGetByte(Uint8 *row, const size_t len, const size_t soffs)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	876 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	877 return (soffs < len) ? row[soffs] : 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	878 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	879
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	880 static BOOL dmPCXFlush(DMPCXData *pcx)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	881 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	882 BOOL ret = fwrite(pcx->buf, sizeof(Uint8), pcx->bufOffs, pcx->fp) == pcx->bufOffs;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	883 pcx->bufOffs = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	884 return ret;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	887 static inline BOOL dmPCXPutByte(DMPCXData *pcx, const Uint8 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	888 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889 if (pcx->bufOffs < pcx->bufLen)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	890 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	891 pcx->buf[pcx->bufOffs++] = val;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892 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	893 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 return dmPCXFlush(pcx);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	898 BOOL dmWritePCXRow(void cbdata, Uint8 row, size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900 DMPCXData pcx = (DMPCXData ) cbdata;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 int plane;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 for (plane = 0; plane < pcx->header->nplanes; plane++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904 {
429 e2f8c9cbc17a Possibly fix 24bit PCX output. Matti Hamalainen <ccr@tnsp.org> parents: 428 diff changeset	905 size_t soffs = 0;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	906 Uint8 data = dmPCXGetByte(row, len, soffs++),
428 983c557f2fbf Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 423 diff changeset	907 count = 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	908
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909 pcx->bufOffs = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911 while (soffs < pcx->header->bpl)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913 if (data == dmPCXGetByte(row, len, soffs) && count < 63)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	914 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915 count++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	916 soffs++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	917 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	918 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	919 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	920 if (count == 1 && (data & 0xC0) != 0xC0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	921 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	922 if (!dmPCXPutByte(pcx, data))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	923 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	924 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	925 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	926 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927 if (!dmPCXPutByte(pcx, 0xC0 \| count) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	928 !dmPCXPutByte(pcx, data))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 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	930 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932 data = dmPCXGetByte(row, len, soffs++);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	933 count = 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937 if (count > 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	938 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 if (!dmPCXPutByte(pcx, 0xC0 \| count) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 !dmPCXPutByte(pcx, data))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 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	942 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	943
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	944 if (!dmPCXFlush(pcx))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	945 return FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	946 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	947
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948 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	949 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	950
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	951
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	952 int dmWritePCXImageFILE(FILE fp, DMImage img, int scale, BOOL paletted)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	954 DMPCXData pcx;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	955 DMPCXHeader hdr;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	956 int res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	957
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	958 // Create output file
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	959 pcx.buf = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 pcx.format = paletted ? DM_IFMT_PALETTE : DM_IFMT_RGB_PLANE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961 pcx.header = &hdr;
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	962 pcx.fp = 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	963
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	964 // Create PCX header
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	965 memset(&hdr, 0, sizeof(hdr));
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	966 if (paletted)
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 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969 for (i = 0; i < (img->ncolors > 16 ? 16 : img->ncolors); i++)
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 hdr.colormap[i].r = img->pal[i].r;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	972 hdr.colormap[i].g = img->pal[i].g;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	973 hdr.colormap[i].b = img->pal[i].b;
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 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	976 hdr.manufacturer = 10;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 hdr.version = 5;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	978 hdr.encoding = 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 hdr.bpp = 8;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980 hdr.hres = img->width * scale;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981 hdr.vres = img->height * scale;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 hdr.xmin = hdr.ymin = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	983 hdr.xmax = hdr.hres - 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	984 hdr.ymax = hdr.vres - 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	985 hdr.nplanes = dmImageGetBytesPerPixel(pcx.format);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986 hdr.palinfo = 1;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	987 res = (img->width * scale);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	988 hdr.bpl = res / 2;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	989 if (res % 2) hdr.bpl++;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	990 hdr.bpl *= 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	991
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	992 dmMsg(2, "PCX: paletted=%d, nplanes=%d, bpp=%d, bpl=%d\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	993 paletted, hdr.nplanes, hdr.bpp, hdr.bpl);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	995 pcx.bufLen = hdr.bpl * 4;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	997 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	998 dmError("PCX: Could not allocate %d bytes for RLE compression buffer.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	999 pcx.bufLen);
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1000 res = DMERR_MALLOC;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1001 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	1002 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1003
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004 // Write PCX header
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1005 if (!dm_fwrite_byte(pcx.fp, hdr.manufacturer) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1006 !dm_fwrite_byte(pcx.fp, hdr.version) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1007 !dm_fwrite_byte(pcx.fp, hdr.encoding) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1008 !dm_fwrite_byte(pcx.fp, hdr.bpp))
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 dmError("PCX: Could not write basic header data.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1011 res = DMERR_FWRITE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1012 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	1013 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1014
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015 if (!dm_fwrite_le16(pcx.fp, hdr.xmin) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1016 !dm_fwrite_le16(pcx.fp, hdr.ymin) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1017 !dm_fwrite_le16(pcx.fp, hdr.xmax) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018 !dm_fwrite_le16(pcx.fp, hdr.ymax) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019 !dm_fwrite_le16(pcx.fp, hdr.hres) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1020 !dm_fwrite_le16(pcx.fp, hdr.vres))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1021 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1022 dmError("PCX: Could not write image dimensions.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1023 res = DMERR_FWRITE;
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 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	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
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1027 if (!dm_fwrite_str(pcx.fp, (Uint8 *) &hdr.colormap, sizeof(hdr.colormap)))
407 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 dmError("PCX: Could not write colormap.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1030 res = DMERR_FWRITE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1031 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	1032 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1033
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1034 if (!dm_fwrite_byte(pcx.fp, hdr.reserved) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1035 !dm_fwrite_byte(pcx.fp, hdr.nplanes) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1036 !dm_fwrite_le16(pcx.fp, hdr.bpl) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1037 !dm_fwrite_le16(pcx.fp, hdr.palinfo) \|\|
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1038 !dm_fwrite_str(pcx.fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler)))
407 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 dmError("PCX: Could not write header remainder.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1041 res = DMERR_FWRITE;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1042 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	1043 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1044
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1045 // Write image data
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1046 res = dmWriteImageData(img, (void *) &pcx, dmWritePCXRow, scale, pcx.format);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1047
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1048 // Write VGA palette
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1049 if (paletted)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1050 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1051 int i;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1052 dm_fwrite_byte(pcx.fp, 0x0C);
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1053 dmMsg(2, "PCX: Writing palette of %d active entries.\n", img->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	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 for (i = 0; i < img->ncolors; i++)
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 dm_fwrite_byte(pcx.fp, img->pal[i].r);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1058 dm_fwrite_byte(pcx.fp, img->pal[i].g);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1059 dm_fwrite_byte(pcx.fp, img->pal[i].b);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1060 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1061
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1062 // Pad the palette, if necessary
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1063 for (; i < 256; i++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1064 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1065 dm_fwrite_byte(pcx.fp, 0);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1066 dm_fwrite_byte(pcx.fp, 0);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1067 dm_fwrite_byte(pcx.fp, 0);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1068 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1069 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1070
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1071 error:
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1072 dmFree(pcx.buf);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1073 return res;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1074 }
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1075
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1076
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1077 int dmWritePCXImage(const char filename, DMImage img, int scale, BOOL paletted)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1078 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1079 FILE *fp;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1080 int 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	1081
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1082 if ((fp = fopen(filename, "wb")) == NULL)
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1083 {
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1084 dmError("PCX: Could not open file '%s' for writing.\n", filename);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1085 return DMERR_FOPEN;
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1086 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1087
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1088 res = dmWritePCXImageFILE(fp, img, scale, paletted);
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1089
d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1090 fclose(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	1091 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1092 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1093
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1094
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1095 static BOOL dmPCXDecodeRLERow(FILE fp, Uint8 buf, const size_t bufLen)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1096 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1097 size_t offs = 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1098 do
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1099 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1100 int count;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1101 Uint8 data;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1102
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1103 if (!dm_fread_byte(fp, &data))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1104 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	1105
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1106 if ((data & 0xC0) == 0xC0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1107 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1108 count = data & 0x3F;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1109 if (!dm_fread_byte(fp, &data))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1110 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	1111 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1112 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1113 count = 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1114
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1115 while (count-- && offs < bufLen)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1116 buf[offs++] = data;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1117
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1118 } while (offs < bufLen);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1119
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1120 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	1121 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1122
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1123
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1124 int dmReadPCXImageFILE(FILE fp, DMImage *pimg)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1125 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1126 DMImage *img;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1127 DMPCXData pcx;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1128 DMPCXHeader hdr;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1129 BOOL paletted;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1130 int res = 0, yc, xc;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1131 Uint8 *dp;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1132
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1133 pcx.buf = NULL;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1134
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1135 // Read PCX header
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1136 if (!dm_fread_byte(fp, &hdr.manufacturer) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1137 !dm_fread_byte(fp, &hdr.version) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1138 !dm_fread_byte(fp, &hdr.encoding) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1139 !dm_fread_byte(fp, &hdr.bpp))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1140 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1141 dmError("PCX: Could not read basic header data.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1142 res = DMERR_FREAD;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1143 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	1144 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1145
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1146 if (hdr.manufacturer != 10 \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1147 hdr.version != 5 \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1148 hdr.encoding != 1 \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1149 hdr.bpp != 8)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1150 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1151 dmError("PCX: Not a PCX file, or unsupported variant.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1152 res = DMERR_FREAD;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1153 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	1154 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1155
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1156 if (!dm_fread_le16(fp, &hdr.xmin) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1157 !dm_fread_le16(fp, &hdr.ymin) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1158 !dm_fread_le16(fp, &hdr.xmax) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1159 !dm_fread_le16(fp, &hdr.ymax) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160 !dm_fread_le16(fp, &hdr.hres) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161 !dm_fread_le16(fp, &hdr.vres))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1162 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1163 dmError("PCX: Could not read image dimensions.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1164 res = DMERR_FREAD;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1165 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	1166 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1167
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1168 if (!dm_fread_str(fp, (Uint8 *) &hdr.colormap, sizeof(hdr.colormap)))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1169 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1170 dmError("PCX: Could not read colormap.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1171 res = DMERR_FREAD;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1172 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	1173 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1174
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1175 if (!dm_fread_byte(fp, &hdr.reserved) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1176 !dm_fread_byte(fp, &hdr.nplanes) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1177 !dm_fread_le16(fp, &hdr.bpl) \|\|
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1178 !dm_fread_le16(fp, &hdr.palinfo) \|\|
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1179 !dm_fread_str(fp, (Uint8 *) &hdr.filler, sizeof(hdr.filler)))
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1180 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1181 dmError("PCX: Could not read header remainder.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1182 res = DMERR_FREAD;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1183 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	1184 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1185
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1186 if (hdr.nplanes != 3 && hdr.nplanes != 1)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1187 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1188 dmError("PCX: Unsupported number of bitplanes %d.\n", hdr.nplanes);
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1189 res = DMERR_FREAD;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1190 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	1191 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1192
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1193 // Allocate image
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1194 if ((*pimg = img = dmImageAlloc(hdr.xmax - hdr.xmin + 1, hdr.ymax - hdr.ymin + 1)) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1195 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1196 dmError("PCX: Could not allocate image structure.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1197 res = DMERR_MALLOC;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1198 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	1199 }
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1200
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1201 paletted = hdr.nplanes == 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1202 pcx.bufLen = hdr.nplanes * hdr.bpl;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1203 if ((pcx.buf = dmMalloc(pcx.bufLen)) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1204 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1205 dmError("PCX: Could not allocate RLE buffer.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1206 res = DMERR_MALLOC;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1207 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	1208 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1209
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1210 // Read image data
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211 dp = img->data;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1212 for (yc = 0; yc < img->height; yc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1213 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1214 // Decode row of RLE'd data
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1215 if (!dmPCXDecodeRLERow(fp, pcx.buf, pcx.bufLen))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1216 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1217 dmError("PCX: Error decoding RLE data.\n");
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1218 res = DMERR_INVALID_DATA;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1219 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	1220 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1221
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1222 // Decode bitplanes
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1223 switch (hdr.nplanes)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1224 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1225 case 1:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1226 memcpy(dp, pcx.buf, img->width);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1227 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1228
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1229 case 3:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1230 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1231 Uint8 *dptr = dp,
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1232 *sptr1 = pcx.buf,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1233 *sptr2 = sptr1 + hdr.bpl,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234 *sptr3 = sptr2 + hdr.bpl;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1235
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1236 for (xc = 0; xc < img->width; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1238 dptr++ = sptr1++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 dptr++ = sptr2++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240 dptr++ = sptr3++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1241 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1242 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1243 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1244 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1245
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1246 dp += img->pitch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1247 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1249 // Read VGA palette
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1250 if (paletted)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1251 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1252 int i;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1253 Uint8 tmpb;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1254 BOOL read;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256 if (!dm_fread_byte(fp, &tmpb) \|\| tmpb != 0x0C)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1258 read = FALSE;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1259 img->ncolors = 16;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1260 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1261 else
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1262 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1263 read = TRUE;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1264 img->ncolors = 256;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1265 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1266
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1267 if ((img->pal = dmCalloc(img->ncolors, sizeof(DMColor))) == NULL)
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1268 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1269 dmError("PCX: Could not allocate palette data!\n");
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1270 res = DMERR_MALLOC;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1271 goto error;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1272 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1273
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1274 if (read)
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1275 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1276 for (i = 0; i < img->ncolors; i++)
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1277 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1278 Uint8 tmpR, tmpG, tmpB;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1279 if (!dm_fread_byte(fp, &tmpR) \|\|
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1280 !dm_fread_byte(fp, &tmpG) \|\|
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1281 !dm_fread_byte(fp, &tmpB))
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1282 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	1283
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1284 img->pal[i].r = tmpR;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1285 img->pal[i].g = tmpG;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1286 img->pal[i].b = tmpB;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1287 }
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1288 }
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1289 else
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1290 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1291 for (i = 0; i < img->ncolors; i++)
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1292 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1293 if (i < 16)
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1294 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1295 img->pal[i].r = hdr.colormap[i].r;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1296 img->pal[i].g = hdr.colormap[i].g;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1297 img->pal[i].b = hdr.colormap[i].b;
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1298 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1299 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1300 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1301
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1302
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1303 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1304
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305 error:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1306 dmFree(pcx.buf);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1308 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1309
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1310
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1311 int dmReadPCXImage(const char filename, DMImage *pimg)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1312 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1313 FILE *fp;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1314 int res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1315
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1316 if ((fp = fopen(filename, "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	1317 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1318 dmError("PCX: Could not open file '%s' for reading.\n", filename);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1319 return -15;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1320 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1321
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1322 res = dmReadPCXImageFILE(fp, pimg);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1323
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1324 fclose(fp);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1326 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1327
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1328
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1329 static int fmtProbePNG(const Uint8 *buf, const size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1330 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1331 if (len > 64 && buf[0] == 0x89 &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1332 buf[1] == 'P' && buf[2] == 'N' && buf[3] == 'G' &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1333 buf[4] == 0x0d && buf[5] == 0x0a)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1334 return DM_PROBE_SCORE_GOOD;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1335
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1336 return DM_PROBE_SCORE_FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1337 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1338
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1340 static int fmtProbePCX(const Uint8 *buf, const size_t len)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1341 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1342 if (len > 128 + 64 &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1343 buf[0] == 10 &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1344 buf[1] == 5 &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1345 buf[2] == 1 &&
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1346 buf[3] == 8)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1347 return DM_PROBE_SCORE_GOOD;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1348
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1349 return DM_PROBE_SCORE_FALSE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1350 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1351
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1352
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1353 #ifdef UNFINISHED
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1354 int dmConvertBMP2(DMImage screen, const DM64Image img)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1355 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1356 int yc;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1357 Uint8 *dp = screen->data;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1358
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1359 for (yc = 0; yc < screen->height; yc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1360 {
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1361 Uint8 *d = dp;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1362 const int y = yc / 8, yb = yc & 7;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1363 const int scroffsy = y * C64_SCR_CH_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1364 const int bmoffsy = y * C64_SCR_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1365 int xc;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1366
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1367 for (xc = 0; xc < screen->width / 2; xc++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1368 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1369 const int x = xc / 4;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1370 const int scroffs = scroffsy + x;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1371 const int b = img->bitmap[0][bmoffsy + (x * 8) + yb];
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1372 const int v = 6 - ((xc * 2) & 6);
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1373 Uint8 c;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1374
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1375 switch ((b >> v) & 3)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1376 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1377 case 0: c = img->bgcolor; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1378 case 1: c = img->screen[0][scroffs] >> 4; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1379 case 2: c = img->screen[0][scroffs] & 15; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1380 case 3: c = img->color[0][scroffs] & 15; break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1381 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1382
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1383 *d++ = c;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1384 *d++ = c;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1385 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1386
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1387 dp += screen->pitch;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1388 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1389
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1390 return 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1391 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1392 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1393
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1394
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1395 int dmWriteImage(char filename, DMImage image, 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	1396 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1397 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	1398 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1399 dmMsg(1, "Outputting %s image %d x %d -> %d x %d [%d]\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1400 imageFormatList[optOutSubFormat],
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1401 image->width, image->height,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1402 image->width * optScale, image->height * optScale, optScale);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1403 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1404
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1405 switch (optOutSubFormat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1406 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1407 #ifdef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1408 case IMGFMT_PNG:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1409 if (info) dmMsg(2, "%s output.\n", optPaletted ? "Indexed 8bpp" : "32bit RGBA");
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1410 return dmWritePNGImage(filename, image, optScale, optPaletted ? DM_IFMT_PALETTE : DM_IFMT_RGBA);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1411 #endif
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1412
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1413 case IMGFMT_PPM:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1414 if (info) dmMsg(2, "24bit RGB output.\n");
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1415 return dmWritePPMImage(filename, image, optScale);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1416
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1417 case IMGFMT_PCX:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1418 if (info) dmMsg(2, "%s output.\n", optPaletted ? "Indexed 8bpp" : "24bit RGB");
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1419 return dmWritePCXImage(filename, image, optScale, optPaletted);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1420
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1421 case 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	1422 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1423 int res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1424 char *palFilename = dm_strdup_printf("%s.pal", filename);
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1425 res = dmWriteIFFMasterRAWPalette(palFilename, image, 1 << optBPP);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1426 dmFree(palFilename);
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1427 if (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	1428 return res;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1429
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1430 if (info) dmMsg(2, "%d bitplanes, %s interleave.\n", optBPP, optInterleave ? "with" : "without");
415 d94f4bcb4be3 IFFMaster RAW output works now, at least to some extent. Matti Hamalainen <ccr@tnsp.org> parents: 409 diff changeset	1431 return dmWriteIFFMasterRAWImage(filename, image, optScale, optBPP, optInterleave);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1432 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1433
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1434 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1435 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	1436 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1437 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1438
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1439
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1440 int dmDumpSpritesAndChars(FILE *inFile)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1441 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1442 int dataOffs, itemCount, outWidth, outWidthPX, outHeight;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1443 size_t bufSize;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1444 Uint8 *bufData;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1445
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1446 switch (optInFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1447 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1448 case FFMT_CHAR:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1449 bufSize = C64_CHR_SIZE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1450 outWidth = C64_CHR_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1451 outWidthPX = C64_CHR_WIDTH_PX;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1452 outHeight = C64_CHR_HEIGHT;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1453 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1454
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1455 case FFMT_SPRITE:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1456 bufSize = C64_SPR_SIZE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1457 outWidth = C64_SPR_WIDTH;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1458 outWidthPX = C64_SPR_WIDTH_PX;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1459 outHeight = C64_SPR_HEIGHT;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1460 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1461
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1462 default:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1463 dmError("Invalid input format %d, internal error.\n", optInFormat);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1464 return -1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1465 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1466
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1467 if ((bufData = dmMalloc(bufSize)) == NULL)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1468 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1469 dmError("Could not allocate temporary buffer of %d bytes.\n", bufSize);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1470 return -2;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1471 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1472
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1473
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1474 dataOffs = optInSkip;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1475 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	1476
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1477 if (optOutFormat == FFMT_ANSI \|\| optOutFormat == FFMT_ASCII)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1478 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1479 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	1480 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	1481
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1482 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	1483 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	1484 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1485 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	1486 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1487 int res = errno;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1488 dmError("Error opening output file '%s'. (%s)\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1489 optOutFilename, strerror(res));
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1490 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	1491 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1492
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1493 while (!feof(inFile) && !error && (optItemCount < 0 \|\| itemCount < optItemCount))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1494 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1495 memset(bufData, 0, bufSize);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1496
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1497 if (fread(bufData, 1, bufSize, inFile) != bufSize)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1498 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1499 dmError("Could not read full bufferful (%d bytes) of data at 0x%x.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1500 bufSize, dataOffs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1501 error = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1502 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1503
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1504 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	1505
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1506 switch (optInFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1507 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1508 case FFMT_CHAR:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1509 dmDumpCharASCII(outFile, bufData, &dataOffs, optOutFormat, optInMulticolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1510 break;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1511 case FFMT_SPRITE:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1512 dmDumpSpriteASCII(outFile, bufData, &dataOffs, optOutFormat, optInMulticolor);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1513 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1514 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1515 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1516 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1517
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1518 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	1519 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1520 else
423 11b3adb3bdb1 Fix image format output. Matti Hamalainen <ccr@tnsp.org> parents: 422 diff changeset	1521 if (optOutFormat == FFMT_IMAGE)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1522 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1523 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	1524 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	1525 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	1526
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1527 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	1528 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1529 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	1530 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1531 dmError("Sequential image output requires filename template.\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1532 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	1533 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1534
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1535 outImage = dmImageAlloc(outWidthPX, outHeight);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1536 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	1537 optItemCount,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1538 outImage->width, outImage->height,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1539 outImage->width * optScale, outImage->height * optScale);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1540 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1541 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1542 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1543 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	1544 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	1545 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1546 dmError("Single-image output requires count to be set (-n).\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1547 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	1548 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1549
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1550 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	1551 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	1552 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	1553 outIHeight++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1554
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1555 outImage = dmImageAlloc(outWidthPX * outIWidth, outIHeight * outHeight);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1556 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1557
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1558 outImage->constpal = TRUE;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1559 outImage->pal = dmC64Palette;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1560 outImage->ncolors = C64_NCOLORS;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1561 outImage->ctrans = 255;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1562
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1563 while (!feof(inFile) && (optItemCount < 0 \|\| itemCount < optItemCount))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1564 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1565 memset(bufData, 0, bufSize);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1566
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1567 if (fread(bufData, 1, bufSize, inFile) != bufSize)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1568 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1569 dmError("Could not read full bufferful (%d bytes) of data at 0x%x.\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1570 bufSize, dataOffs);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1571 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1572 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1573
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1574 if ((err = dmC64ConvertCSData(outImage, outX * outWidthPX, outY * outHeight,
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1575 bufData, outWidth, outHeight, optInMulticolor, optColors)) != 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	1576 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1577 dmError("Internal error in conversion of raw data to bitmap: %d.\n", err);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1578 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1579 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1580
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1581 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	1582 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1583 outFilename = dm_strdup_printf("%s%04d.%s", optOutFilename, itemCount, convFormatList[optOutFormat].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	1584 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	1585 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1586 dmError("Could not allocate memory for filename template?\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1587 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	1588 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1589
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1590 dmWriteImage(outFilename, outImage, 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	1591 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	1592 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1593 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1594 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1595 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	1596 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1597 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	1598 outY++;
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
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1602 itemCount++;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1603 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1604
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1605 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	1606 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1607 dmWriteImage(optOutFilename, outImage, 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	1608 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1609
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1610 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	1611 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1612
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1613 dmFree(bufData);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1614 return 0;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1615
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1616 error:
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1617 dmFree(bufData);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1618 return -1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1619 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1620
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1621
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1622 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	1623 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1624 FILE *inFile;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1625 DMC64ImageFormat *cfmt;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1626 DMC64Image cimage;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1627 Uint8 *dataBuf = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1628 size_t dataSize;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1629 int 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	1630
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1631 // Default colors
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1632 for (i = 0; i < C64_MAX_COLORS; i++)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1633 optColors[i] = i + 1;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1634
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1635 // Initialize and parse commandline
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1636 dmInitProg("gfxconv", "Simple c64 graphics converter", "0.4", NULL, NULL);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1637
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1638 if (!dmArgsProcess(argc, argv, optList, optListN,
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1639 argHandleOpt, argHandleFile, TRUE))
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1640 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	1641
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1642 #ifndef DM_USE_LIBPNG
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1643 if (optOutFormat == IMGFMT_PNG)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1644 {
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1645 dmError("PNG output format support not compiled in, sorry.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1646 goto error;
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1647 }
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1648 #endif
b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1649
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1650 // Determine input format, if not specified'
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1651 if (optInFormat == FFMT_AUTO && optInFilename != NULL)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1652 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1653 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	1654 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	1655 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1656 dmGetFormatByExt(dext + 1, &optInFormat, &optInSubFormat);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1657 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1658 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1659
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1660 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	1661 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1662 if (optInFormat == FFMT_AUTO)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1663 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1664 dmError("Standard input cannot be used without specifying input format.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1665 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	1666 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1667 inFile = stdin;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1668 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1669 else
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1670 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	1671 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1672 int res = errno;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1673 dmError("Error opening input file '%s'. (%s)\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1674 optInFilename, strerror(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1675 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	1676 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1677
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1678 if (dmReadDataFile(inFile, NULL, &dataBuf, &dataSize) != 0)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1679 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1680
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1681 if (optInFormat == FFMT_AUTO \|\| optInFormat == FFMT_BITMAP)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1682 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1683 // Probe for format
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1684 DMC64ImageFormat *forced = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1685 int res;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1686
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1687 if (optForcedFormat >= 0)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1688 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1689 forced = &dmC64ImageFormats[optForcedFormat];
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1690 dmMsg(0,"Forced %s format image, type %d, %s\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1691 forced->name, forced->type, forced->extension);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1692 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1693
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1694 res = dmC64DecodeBMP(&cimage, dataBuf, dataSize, optInSkip, optInSkip + 2, &cfmt, forced);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1695 if (forced == NULL && cfmt != 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	1696 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1697 dmMsg(1,"Probed %s format image, type %d, %s\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1698 cfmt->name, cfmt->type, cfmt->extension);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1699 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1700
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1701 if (res == 0)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1702 optInFormat = FFMT_BITMAP;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1703 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1704
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1705 if (optInFormat == FFMT_AUTO)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1706 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1707 // XXX, needs a proper probe loop
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1708 if (fmtProbePNG(dataBuf + optInSkip, dataSize - optInSkip))
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1709 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1710 optInFormat = FFMT_IMAGE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1711 optInSubFormat = IMGFMT_PNG;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1712 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1713 else
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1714 if (fmtProbePCX(dataBuf + optInSkip, dataSize - optInSkip))
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1715 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1716 optInFormat = FFMT_IMAGE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1717 optInSubFormat = IMGFMT_PCX;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1718 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1719 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1720
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1721 if (optInFormat == FFMT_AUTO)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1722 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1723 dmError("No input format specified, and could not be determined automatically.\n");
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1724 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	1725 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1726
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1727 // Skip, if needed
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1728 if (fseek(inFile, optInSkip, SEEK_SET) != 0)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1729 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1730 int res = errno;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1731 dmError("Could not seek to file position %d (0x%x): %s\n",
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1732 optInSkip, optInSkip, strerror(res));
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1733 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1734 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1735
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1736 int inFormat = dmGetConvFormat(optInFormat, optInSubFormat),
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1737 outFormat = dmGetConvFormat(optOutFormat, optOutSubFormat);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1738
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1739 if (inFormat != -1 && outFormat != -1)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1740 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1741 char *inFmtName = convFormatList[inFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1742 *inFmtExt = convFormatList[inFormat].fext,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1743 *outFmtName = convFormatList[outFormat].name,
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1744 *outFmtExt = convFormatList[outFormat].fext;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1745
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1746 if (optInFormat == FFMT_BITMAP)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1747 inFmtExt = cfmt->name;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1748
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1749 dmMsg(1, "Attempting conversion %s (%s) -> %s (%s)\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1750 inFmtName, inFmtExt, outFmtName, outFmtExt);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1751 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1752
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1753 switch (optInFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1754 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1755 case FFMT_SPRITE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1756 case FFMT_CHAR:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1757 dmDumpSpritesAndChars(inFile);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1758 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1759
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1760 case FFMT_BITMAP:
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1761 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1762 DMImage *img = NULL;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1763 int res = DMERR_OK;
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1764
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1765 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	1766 {
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1767 dmError("Output filename not set, required for image formats.\n");
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1768 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1769 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1770
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1771 switch (optOutFormat)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1772 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1773 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1774 if ((img = dmImageAlloc(C64_SCR_WIDTH, C64_SCR_HEIGHT)) == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1775 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1776 dmError("Could not allocate output image surface %d x %d.\n",
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1777 C64_SCR_WIDTH, C64_SCR_HEIGHT);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1778 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1779 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1780
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1781 img->pal = (DMColor *) &dmC64Palette;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1782 img->ncolors = C64_NCOLORS;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1783 img->constpal = TRUE;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1784
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1785 if (cfmt->convert != NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1786 res = cfmt->convert(img, &cimage);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1787 else
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1788 res = dmC64ConvertGenericBMP2Image(img, &cimage);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1789
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1790 if (res != DMERR_OK \|\| img == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1791 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1792 dmError("Error in bitmap to image conversion.\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1793 goto error;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1794 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1795
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1796 res = dmWriteImage(optOutFilename, img, TRUE);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1797 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1798
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1799 default:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1800 dmError("Unsupported output format for bitmap/image conversion.\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1801 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1802 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1803
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1804 dmImageFree(img);
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1805 }
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1806 break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1807
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1808 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1809 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1810 DMImage *img;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1811 int res = DMERR_OK;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1812
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1813 if (optOutFilename == NULL)
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1814 {
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1815 dmError("Output filename not set, required for image formats.\n");
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1816 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	1817 }
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 // Read input
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1820 switch (optInSubFormat)
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1821 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1822 case IMGFMT_PCX: res = dmReadPCXImageFILE(inFile, &img); break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1823 // case IMGFMT_PNG: res = dmReadPNGImageFILE(inFile, &img); break;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1824 // case IMGFMT_ARAW: res = dmReadARAWImageFILE(inFile, &img, optBPP); break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1825 default:
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1826 dmError("Unsupported input image format for bitmap/image conversion.\n");
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1827 break;
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1828
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1829 }
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1830
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1831 if (res != DMERR_OK \|\| img == NULL)
409 b529b7e8ff83 Various improvements and cruft cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 407 diff changeset	1832 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	1833
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1834 switch (optOutFormat)
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1835 {
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1836 case FFMT_IMAGE:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1837 res = dmWriteImage(optOutFilename, img, 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	1838 break;
417 9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1839
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1840 default:
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1841 dmError("Unsupported output format for bitmap/image conversion.\n");
9ace8a5c58d9 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 416 diff changeset	1842 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	1843 }
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1844
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1845 dmImageFree(img);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1846 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1847 break;
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1848 }
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1849
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1850 fclose(inFile);
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1851
59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1852 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	1853 return 0;
419 936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1854
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1855 error:
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1856 return -3;
936bc27a79d6 Modularize some functions to lib64gfx, fix bitmap -> image conversion, Matti Hamalainen <ccr@tnsp.org> parents: 417 diff changeset	1857 exit(3);
407 59244a7ae37f Move c64 utilities to the engine lib, as we benefit from a common framework. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1858 }

Mercurial > hg > dmlib

annotate gfxconv.c @ 431:e3ebcbc4ace2